Revert "Merge branch 'master' of https://github.com/mmullen/SENG513-PhotoStream"

This reverts commit 9c95b49eb3a14276a32760590a4f23c604704a48, reversing
changes made to fb749169e75a84bd09b9cc3859e9f8049de9d0fc.