_
Merge branch 'master' of github.com:daviddennis/New-York-Education

Conflicts:
	app/static/css/base.css
	app/templates/analyze.html
_
Merge branch 'master' of github.com:daviddennis/New-York-Education

Conflicts:
	app/templates/analyze.html
_