More police data integration
Merge branch 'master' of github.com:leonpegg/springhack
Police data change
Merge branch 'master' of github.com:leonpegg/springhack

Conflicts:
	app.js
	routes/index.js
Front end file and backend file for police data
Merge branch 'master' of github.com:leonpegg/springhack
Updatd for police data
Merge branch 'master' of github.com:leonpegg/springhack

Conflicts:
	public/stylesheets/layout.css
	views/index.jade
	views/layout.jade