preloader with progressbar
Merge branch 'master' of github.com:BattleRattle/gamejam6

Conflicts:
	web/js/app.js