Merge pull request #9 from thepostalworker/MyBranch-(James)

My branch (james)
level 1
Merge pull request #10 from thepostalworker/SamTime

level 1
hurp
Merge branch 'master' of https://github.com/thepostalworker/SpaceTown