changed IP addr in SSGameSetup to current AJIP
Merge branch 'master' of https://github.com/ajk1311/EECS494
Finished scrolling in GUI
Fixed merge conflicts