Minor changes to pointlights, implemented time-delay flicker
Merge branch 'master' of https://github.com/ICMediaLab/HelloGame

Conflicts:
	src/game/GameplayState.java