Test out socket io
Merge branch 'master' of github.com:edwardrf/lh2

Conflicts:
	app/js/app.js
	app/js/controllers.js
	app/partials/edit.html