End of 13/1/13
go!
Merge branch 'master' of https://github.com/Imperiouspi/Complex-Life

Conflicts:
	bin/aWindow$optionsAction.class
	bin/aWindow$playAction.class
	bin/aWindow$quitAction.class
	bin/aWindow.class
	bin/lifeForms/plants/DeadGrass.class
	bin/lifeForms/plants/Grass.class
	src/aWindow.java
	src/gui/BackgroundPanel.java
	src/gui/GamePane.java
	src/gui/LabelButton.java
	src/gui/MenuPane.java
	src/gui/QuitButton.java
	src/gui/WorldPanel.java
	src/lifeForms/animals/Deer.java