LogoAnimation and CustomSegue
Merge branch 'master' of https://github.com/DeWitt-Dev/Expresso

Conflicts:
	Expresso.xcodeproj/project.pbxproj
	Expresso/Base.lproj/Main_iPhone.storyboard