hi
eerge branch 'master' of https://github.com/allegrocm/Falcon
resolved conflicts

Conflicts:
	data/Settings.txt
added Gun class for shot contorl
Merge branch 'master' of https://github.com/allegrocm/Falcon
tweaked more for the C6