minor changes with annielaurie
Merge branch 'master' of github.com:hcwiley/DataEyeTracker

Conflicts:
	MinimalGazeDataStream/MinimalGazeDataStream.cpp