..
Merge branch 'master' of https://github.com/ehatle/GameJam-2013
Modified hit detection
Merge and mods

Merge branch 'master' of https://github.com/ehatle/GameJam-2013

Conflicts:
	GAMEJAM2013.pde
	Shape.pde
Merge branch 'master' of https://github.com/ehatle/GameJam-2013

Conflicts:
	Map.pde
Merge branch 'master' of https://github.com/ehatle/GameJam-2013
Merge branch 'master' of https://github.com/ehatle/GameJam-2013

Conflicts:
	Map.pde