Initial commit
Merge https://github.com/IAmRasputin/CS4Project