More types of enemies, and lasers that "cost" light
Merge branch 'master' of https://github.com/iebaker/game-final-project

Conflicts:
	src/game/GameWorld.java