More refactoring
Merge branch 'master' of https://github.com/jessicayuen/CMPUT301T13
testing the ES helper photo issue