initial commit
Merge https://github.com/RileyAdam/csci342project