Fixing
Merge branch 'master' of https://github.com/nplaster/CSCI446-Team4
Merge branch 'master' of https://github.com/nplaster/CSCI446-Team4
Migrated status from int to string