Merge pull request #9 from aedwards12/timersetup

Refactor View Controller code to allow for variable rest time
redo http post_function so that data is stored for playground file
Merge pull request #10 from krauzer/http_post

redo http post_function so that data is stored for playground file
Setup HTTP_Post File
Merge pull request #11 from krauzer/http_post

Setup HTTP_Post File/ Fix .gitignore
Move Post Function out of main View Controller
Merge pull request #12 from krauzer/http_post

Move Post Function out of main View Controller
Add working pause, reset, start buttons for timer
Sends JSON Post request to rails server
Modularize toSecondsDisplay code by taking it out of ViewController and giving it its own file.
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
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