CodeForTucson / codefortucson-site

Current Code for Tucson website
http://www.codefortucson.org
GNU General Public License v2.0
3 stars 8 forks source link

Catches master up to gh-pages #36

Closed meiqimichelle closed 9 years ago

meiqimichelle commented 9 years ago

I've been making quick-fixes to gh-pages instead of using master as staging (as I should be). This pull request is to merge newer gh-pages commits back into master to get them in sync with each other again.