first commit
no trees at spawn
Merge branch 'master' into gh-pages

Conflicts:
	js/game.js