added history
Merge branch 'master' of https://github.com/atscott/PointTracker

Conflicts:
	PointTracker.xcodeproj/project.pbxproj