Fixing to compile with 4.8 toolchain
Merge branch 'master' of github.com:RobotsWar/RobotsWar

Conflicts:
	LibMaple/libmaple/include/libmaple/libmaple_types.h