start getting ROI working again
Merge branch 'master' of github.com:RyanHope/gazetools into working
Merge remote-tracking branch 'origin/working'

Conflicts:
	R/getFixations.R