Added Buttons and Interface Options
Merge branch 'master' of https://github.com/foresight97/Allison-Thesis

Conflicts:
	Allison Thesis/Allison Thesis/Base.lproj/Main_iPhone.storyboard