Moved Log Off button into settings page, modified user profile pic onto the navigation bar, began to setup userprofile buttons such as the likes and posts buttons and managed to implement them successfully
Merge remote-tracking branch 'origin/eric' into bala

Conflicts:
	ParseStarterProject/Main.storyboard
fixed merge issues