Merge branch 'master' of https://github.com/jaantti/Firestarter into HEAD

Conflicts:
	2014/include/RobotLogic.h
	2014/src/RobotLogic.cpp