everything works finished code
Merge branch 'master' of github.com:nplaster/CSCI446-Team4