progress
Merge branch 'master' of https://github.com/ahalbert/cs645-group-project