mmf photo endpoint finished
merge conflict
Merge branch 'master' into user-photo
merge conflict
removed commented out code in sessions controller
Merge pull request #44 from edatrix/user-photo

User photo endpoint working properly