Gitignore fixed
Merge branch 'master' into nair

Conflicts:
	Assignment1_minipaint/.cproject
	Assignment1_minipaint/Debug/Assignment1_minipaint
	Assignment1_minipaint/Debug/Test.o