Removed redundant code
Merge branch 'master' of https://github.com/tliu91/PhotoFlow-server
Merge branch 'master' of https://github.com/tliu91/PhotoFlow-server