warning fixes
tidied up code
Merge branch 'master' into wip

Conflicts:
	cppFIGHT.cpp