Merge branch 'master' into eyeCorners
Changes
Update the GitIgnore file
start settings panel linking with constants.h
Settings Controller Refractor
Settings page update
General Update
Settings - Fixes storage, Adds Event Handlers
add PupilTracking class
mod
Completed PupilTracking implementation file. WIP for defaulting values in settings panel.
Fixed issues with sliders. Now initialises NSUserDefaults with sensible values for each key. Fixed null pointer issue.
Add back button to Debug UIImageView. Adjust where corner pointers are created and released. Release pointers.
Octotypes
Merge remote-tracking branch 'origin/Octotypes' into eyeCorners

Conflicts:
	iSee.xcodeproj/project.pbxproj
	iSee/SettingsViewController.m
	iSee/Storyboard.storyboard
	iSee/ViewController.m
Add Extra settings. Merge with Dan’s code and fix issues with merge. Clean up code for demo.
Merge pull request #4 from DanielKoehler/eyeCorners

Eye corners