Merge branch 'master' into develop/attraptor
removed duplicated parameters
Merge branch 'master' into develop/scene-simple
Resolved conflicts
determine collided objects
Refactoring + good and bad objects
Merge branch 'develop/scene-simple' into develop/attraptor

Conflicts:
	assets/js/render.js
Start screen
Hide cursor
Fixed controls
removing objects from scene now
merge master to music
better points counting
Merge remote-tracking branch 'origin/develop/music' into develop/scene-simple

Conflicts:
	assets/js/render.js
merge with scene-simple
music loop
speed change
delete speedlog
speed increase
add speed coefficient