Bla
Merge branch 'master' of github.com:ttencate/ld26
Merge branch 'master' of github.com:ttencate/ld26
Add collisioning
Merge branch 'master' of github.com:ttencate/ld26

Conflicts:
	300-renderer.coffee