turned off lights for now and started work on shifting the canvas to the right place
Work towards getting the background to draw properly
Merge branch 'master' of http://github.com/scwe/YoloRiot

Conflicts:
	src/gui/MapPanel.java
	src/model/Model.java
	src/projectiles/WeakProjectile.java
Merge branch 'master' of http://github.com/scwe/YoloRiot