Removed scrolling and changed canvas size to 1200x600
Merge branch 'master' of https://github.com/gamubo/sails-ho

Conflicts:
	Client/shell.js