changed settings.OUR_HOST
from local host to http://cs410.cs.ualberta.ca:41011/
Merge branch 'master' of https://github.com/awwong1/CMPUT410-Project