minor
sever now serves from brandon's client folder. Added a redirect
Server sends back an array of data from postgres on /collocation.
Merge branch 'master' of https://github.com/noahcharris/Newspeak

Conflicts:
	server/public/client/charts/collocationChart.js
	server/public/client/controllers.js
	server/routes.js