Took the 'remote' out of adding a remote friend
Merge branch 'master' of https://github.com/tpolasek/cmput410-project