Initial commit
Merge branch 'master' of github.com:Gollum999/cs5600-project