timer for main loop. Changes to startScreen
Merge branch 'master' of http://github.com/scwe/YoloRiot

Conflicts:
	src/gui/YoloRiot.java