Modified .gitignore to ignore makefile for now
Merge branch 'master' into Rect_detect

Gitignore modification