added include <opencv/highgui.h> to get OpenCV defines such as CV_LOAD*
added a file to gitignore
Merge remote-tracking branch 'origin/master'