game logic things
Merge branch 'master' of github.com:nesQuick/transporter

Conflicts:
	source/index.html.erb
	source/javascripts/service/level-service.js.coffee