Changes to HelloWorld to test GitConflicts
Merge branch 'master' of ssh://git@github.com/kryel/SecretRobot.git
added field: targetFrameRate in helloWorld
Merge branch 'master' of ssh://git@github.com/kryel/SecretRobot.git
helloworld stuff
Merge branch 'master' of ssh://git@github.com/kryel/SecretRobot.git

Conflicts:
	2dGame/src/main/HelloWorld.java