derp
fix storyboard conflict

Merge branch 'master' of https://github.com/thomasorten/Recommend

Conflicts:
	Recommend/Base.lproj/Main.storyboard
fixed broken segues
Collection view layout and animations.
changed things
fixed conflicts
Merge branch 'master' of https://github.com/thomasorten/Recommend

Conflicts:
	Recommend/AddRecommendationViewController.m
	Recommend/Base.lproj/Main.storyboard
	Recommend/HomeViewController.m
	Recommend/TabBarViewController.m
uhoh
sidebar / login
Implemented custom album picker.
Fixed merge.
Added user profile pic.
Added icons.
Category bug didn't add default category.