storyboard
Merge branch 'master' of https://github.com/nahughes2/Affirmations-iOS

Conflicts:
	Affirmations/Base.lproj/Main.storyboard