first commit - code updated as of 11/18
Merge branch 'master' of https://github.com/Shockwave4546/Cosmos