merge
Merge branch 'master' of github.com:patverga/CS645-Project