:/
messing about with threejs
Merge branch 'master' of github.com:TEAM-NAME-PHP/simulation-thingy

Conflicts:
	assets/game.coffee
	index.html