edit
Merge branch 'gh-pages' of https://github.com/jimrsmiley/septa-crime into gh-pages

Conflicts:
	src/img/favicon.ico
	src/img/zf2-logo.png