lost track
Merge branch 'master' of https://github.com/hall5714/Freedom-Galaxy
fixed
NO CAMELCASE
debugging service.py
bing
pfft
Detection routine bugs fixed, mil combat complete
and the orm
blah
split and orm updates
merged all the stuff
races and mission imports disabled
blah
I hate jeff
Merge branch 'master' of https://github.com/hall5714/Freedom-Galaxy
typos
Merge branch 'master' of https://github.com/hall5714/Freedom-Galaxy
Added orbit boxes to yaml scenario and fixed split stack
exposed split and merge stack functionality