changes to make the two display areas side by side.
Merge branch 'enchantjs' of https://github.com/fidgetwidget/node-game-proj into enchantjs

Conflicts:
	public/coffee/src/entity.coffee
	public/javascripts/app.js