fixed bug when args was null
modified main arguments
Merge remote-tracking branch 'origin/branch2'

Conflicts:
	CornflowerGarden.java
changed framerate
Merge remote-tracking branch 'origin/master' into branch2