Resizer
Merge branch 'master' of github.com:Qaterknan/LudumDare26

Conflicts:
	assets/js/player.js
Merge branch 'master' of github.com:Qaterknan/LudumDare26

Conflicts:
	assets/js/player.js