initial commit
Merge branch 'master' of https://github.com/insomniac34/CS1699_Project3