test
Merge branch 'master' of https://github.com/Armienn/flaming-robot.git

Conflicts:
	FlamingRobot/src/StartHere.java
Goodbye world