Shooting v0.1
Merge branch 'master' of https://github.com/nunovalente/ScorchedEarth_GUI

Conflicts:
	ScorchedEarth_GUI/GUIDialog.cpp
	ScorchedEarth_GUI/GUIDialog.h
	ScorchedEarth_GUI/TestWx3Main.cpp
	ScorchedEarth_GUI/TestWx3Main.h
	ScorchedEarth_GUI/WxWizDialog.fbp
	ScorchedEarth_GUI/menu.h
	ScorchedEarth_GUI/shot_formula.cpp
	ScorchedEarth_GUI/shot_formula.h
	ScorchedEarth_GUI/shot_hit.cpp