Commenting
Merge branch 'master' of github.com:aisopuro/DigiMedia

Conflicts:
	beatblaster/js/gamemanager.js