final day 1 changes
Merge branch 'master' of github.com:alkazar/spacecrash