first commit
Merge remote-tracking branch 'origin/master' into Albert

Conflicts:
	Assignment1_minipaint/Debug/makefile
	Assignment1_minipaint/Debug/objects.mk
	Assignment1_minipaint/Debug/subdir.mk
delete project
Merge remote-tracking branch 'origin/master' into Albert
Merge remote-tracking branch 'origin/master' into Albert
Merge branch 'David' of https://github.com/abhinavnair92/MiniPaint into David

Conflicts:
	.gitignore
	Assignment1_minipaint/Debug/Assignment1_minipaint.exe
	Assignment1_minipaint/Debug/Test.o
Merge branch 'Albert' of https://github.com/abhinavnair92/MiniPaint into Albert

Conflicts:
	Assignment1_minipaint/.cproject
	Assignment1_minipaint/Debug/makefile
	Assignment1_minipaint/Debug/objects.mk
	Assignment1_minipaint/Debug/subdir.mk
	Assignment1_minipaint/Test.cpp
Merge branch 'Albert' of https://github.com/abhinavnair92/MiniPaint into Albert