can switch between views
Add two view with button press to Storyboard and ViewController
Merge branch 'master' of https://github.com/red-spotted-newts-2014/rest-less-ios into timersetup

Conflicts:
	Rest Less/.DS_Store
	Rest Less/Rest Less.xcodeproj/project.pbxproj
	Rest Less/Rest Less.xcodeproj/project.xcworkspace/xcshareddata/Rest Less.xccheckout
	Rest Less/Rest Less/Base.lproj/Main.storyboard
Removed picker element and leftover merge code
Merge pull request #16 from aedwards12/timersetup

Fixed merge conflicts with view elements on storyboard