Merge branch 'doug'
Merge branch 'doug'
Merge pull request #1 from dsherida/doug

Doug
wishes are being added on Parse
Merge remote-tracking branch 'origin/master'
added privacy field
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into doug
profileviewcontroller now works, pulls images and data from the UserModel, UserModel seems to be working correctly