Merge branch 'master' of github.com:abertsch/eye-tracking

Conflicts:
	README.md