woo
conflict fix and continuing Level1
Merge branch 'master' of https://github.com/macilath/Star-Command-Division-6
First draft of level 1 complete, starting victory conditions