can switch between views
Merge pull request #14 from user1011/master

Add working pause, reset, start buttons for timer
test out setting time intervals to a variable so you can accumulate total passed time
Fix Merge Conflict With Regard Calculating Time Intervals
Setup workout class to be used as model in main app
add planned times array to workout logger class
Merge pull request #15 from krauzer/Workout_class

Make Workout class
Remove invalid JSON from ViewController
Merge branch 'master' of https://github.com/red-spotted-newts-2014/rest-less-ios
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
Merge branch 'master' of https://github.com/red-spotted-newts-2014/rest-less-ios
Changed type conversion from UInt8 to UInt64 in secondsToDisplay to allow for more cases.
Add start workout, finished workout, finished exercise buttons to active view.
Add totalWorkoutTimer to SecondViewController - future change this to active view controller
Add swipe gestures to SecondViewController, though not responding to swipe yet