Commented shortcut to tab bar
Resolved conflicts merging with master
Nav bar showing titles for 4 tabs
Merge branch 'efren'

Merged logout action
Changes on the type of objects for integration with parse
Merge branch 'master' of https://github.com/TijoMONSTER/Instagram

Conflicts:
	Instagram/FacebookLoginViewController.m
	Instagram/Instagram-Prefix.pch
	Instagram/LoginTypeSelectionViewController.m
Added logout option in UserProfileVC
Merge branch 'master' of https://github.com/TijoMONSTER/Instagram
solved a little conflict on the test suite
Merge branch 'master' of https://github.com/TijoMONSTER/Instagram
Fixed User.h error
Merge branch 'master' of https://github.com/TijoMONSTER/Instagram
made the facebook login go thru the model and added delegate methods
Merge branch 'master' of https://github.com/TijoMONSTER/Instagram
Added UserProfile VC stub class
Merge branch 'ivan'
cleanup for simplicity
Merge branch 'master' of https://github.com/TijoMONSTER/Instagram
Removed edit profile button
Added Photo Detail VC