Added branch support for story; still a few small bugs to iron out
Merge branch 'master' of https://github.com/yjm607/CS408--Critter-Friends

Conflicts:
	Tiny Tastes/en.lproj/MainStoryboard_iPad.storyboard
	Tiny Tastes/story.xml
Merge branch 'master' of https://github.com/yjm607/CS408--Critter-Friends