Sierra edits 12-1-13
Merge branch 'master' of https://github.com/jennygathright/Jenny-and-Sierra-s-Final-Project

Conflicts:
	Jenny and Sierra's Final Project/Storyboard.storyboard
Sierra edits