working
Merge branch 'master' of https://github.com/mdko/cs360-group-project