Merge latest from master
Merge branch 'gh-pages' of github.com:asheville/web into gh-pages

Conflicts:
	app.css
	app.js
	index.html
Merge latest from master