Add TILES and use it
Merge branch 'master' of https://github.com/Logi0/vilify

Conflicts:
	main.js
Fixed conflict in merge #3877d7864c
Fixed conflict in merge #3877d7864c

There seemed to be more conflicts with merging my commit and @zento's commit (2beda0c786). I believe it is fixed. Please review new code. I placed the settings and assetManager into the settings and Game objects, respectively.
Update .gitignore
Merge branch 'master' of github.com:Logi0/vilify
Update main.js
Some more refactering and fix errors
Refactering
Refactering
Fix error
Update AssetManager
Fix settings.map.draw()