minor changes, can currently compile
Merge branch 'master' of https://github.com/CSCI222-Group-4/master
Merge branch 'master' of https://github.com/CSCI222-Group-4/master
Merge branch 'master' of https://github.com/CSCI222-Group-4/master
Merge branch 'master' of https://github.com/CSCI222-Group-4/master
updating as to connect to server
Merge branch 'master' of https://github.com/CSCI222-Group-4/master