stashing to check on eric's code
added basic networking and user name input
got a heartbeat working
Merge branch 'master' into stashed

Conflicts:
	app/js/app.js
	views/index.ejs
	views/partials/includes.ejs
Merge branch 'master' of github.com:Dr-Jerm/nmGameJam2013

Conflicts:
	views/index.ejs