slider works - reset button implemented
slider works - reset button implemented
Merge branch 'shane'

Conflicts:
	.DS_Store

Puzzle.xcodeproj/project.xcworkspace/xcuserdata/shanegermann.xcuserdatad
/UserInterfaceState.xcuserstate