Fixing Conner's mess.....
Merge branch 'master' of http://github.com/se-SteveThePirate/CMPUT301W13T01