forgot to change over to my branch, made minor xib changes, they should not impact anyone
updated colors
Merge branch 'master' of github.com:Baconthorpe/Greatist_iOS_App_Ever into interface
removed icons from mainfeed
Merge branch 'master' of github.com:Baconthorpe/Greatist_iOS_App_Ever into interface
added step one and step two xibs
Merge branch 'master' of github.com:Baconthorpe/Greatist_iOS_App_Ever
dealing with merge conflicts
still resolving storyboard conflicts