location is broken
Merge branch 'master' of https://github.com/rrmallya/TartanHacks

Conflicts:
	public/client.js
	server.js
	views/clientpage.jade