Consolidated save() function.

Merge tag 'chapter-8-swift-2' into HEAD

Conflicts:
	Coffee Timer/Coffee Timer.xcodeproj/project.pbxproj
	Coffee Timer/Coffee Timer.xcodeproj/project.xcworkspace/xcuserdata/ash.xcuserdatad/UserInterfaceState.xcuserstate
	Coffee Timer/Coffee Timer/TimerEditViewController.swift

Merge tag 'chapter-7-swift-2' into HEAD

Conflicts:
	Coffee Timer/.gitignore
	Coffee Timer/Coffee Timer.xcodeproj/project.pbxproj
	Coffee Timer/Coffee Timer.xcodeproj/project.xcworkspace/xcuserdata/ash.xcuserdatad/UserInterfaceState.xcuserstate
	Coffee Timer/Coffee Timer/AppDelegate.swift
	Coffee Timer/Coffee Timer/Base.lproj/Main.storyboard
	Coffee Timer/Coffee Timer/Images.xcassets/AppIcon.appiconset/Contents.json
	Coffee Timer/Coffee Timer/Info.plist

Merge tag 'chapter-6-swift-2' into HEAD

Conflicts:
	Coffee Timer/Coffee Timer.xcodeproj/project.xcworkspace/xcuserdata/ash.xcuserdatad/UserInterfaceState.xcuserstate

Merge tag 'chapter-5-swift-2' into HEAD

Conflicts:
	Coffee Timer/Coffee Timer.xcodeproj/project.xcworkspace/xcuserdata/ash.xcuserdatad/UserInterfaceState.xcuserstate
	Coffee Timer/Coffee Timer/Base.lproj/Main.storyboard

Merge tag 'chapter-4-swift-2' into HEAD

Conflicts:
	Coffee Timer/Coffee Timer/Base.lproj/Main.storyboard

Swift 2 Updates.

Xcode 7 migration.

Xcode 7 transition.

Xcode 7 transition.