Merge and fix conflict
Colorbackground + shake detection init
Merge branch 'master' of github.com:papaloizouc/sockets

Conflicts:
	sockets_V2/front_end/js/depth_tracker.js
remote better layout + gitignore
Merge branch 'master' of github.com:papaloizouc/sockets
Merge branch 'master' of github.com:papaloizouc/sockets
add the shuffle thing
Merge branch 'master' of github.com:papaloizouc/sockets
Merge from conflict
enable zooming unzooming
Merge branch 'master' of github.com:papaloizouc/sockets
Merge branch 'master' of github.com:papaloizouc/sockets