added map to the preloader and started upgrades
Merge branch 'master' of https://github.com/fritzr/fritzr.github.io

Conflicts:
	js/LevelTwo.js
	js/Preloader.js
changed stuff in preloader