Fixing github obnoxiousness.
fixing for merge
formatting
Merge branch 'onepage' of https://github.com/codeforamerica/airwolf into onepage

Conflicts:
	index.html
Merge branch 'pages' into gh-pages
Merge branch 'pages' into gh-pages
Merging differences in index.html.
merging some new changes