Added some black magic.
Merge branch 'master' of github.com:Portalen/Portalen

# By Tim Garbos
# Via Tim Garbos
* 'master' of github.com:Portalen/Portalen:
  - Initial setup on mac mini
  - Fixing some merge errors regarding flags
  - optical flow tracking of ROI

Conflicts:
	Portalen.xcodeproj/project.pbxproj
	src/ofApp.cpp
	src/ofApp.h
removed deinterlace shader, not needed.