attempted to add in logs but Addison beat me to it
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration

Conflicts:
	Novad/src/Control.cpp
FIXED A syntax error within Control.cpp