init
init
Merge branch 'master' of https://github.com/clanofnoobs/realtime-whiteboard

Conflicts:
	app.js