testing shake
Merge branch 'master' of https://github.com/bbqlab/rangama
shake testing again
yo
Merge branch 'master' of https://github.com/bbqlab/rangama

Conflicts:
	gameapp_fe/app/app.js
Merge branch 'master' of https://github.com/bbqlab/rangama
shake/rumble effect