Merge branch 'doug'
Merge branch 'doug'
Removed file that shouldn't be tracked
working on profile tab
Merge remote-tracking branch 'origin/master'
added UserModel class to represent the data of the Facebook user
Merge branch 'master' into doug
profileviewcontroller now works, pulls images and data from the UserModel, UserModel seems to be working correctly
Merge branch 'doug'