WHYYYYY SIZE
Merge branch 'master' of https://github.com/Trayus/webjam

Conflicts:
	player.js
Merge branch 'master' of https://github.com/Trayus/webjam

Conflicts:
	player.js
changed... stuff
Merge branch 'master' of https://github.com/Trayus/webjam