Fixed some issues
Merge branch 'master' of github.com:UIowa-6K183/Group7_TeamSite