Merge branch 'Albert' of https://github.com/abhinavnair92/MiniPaint into Albert

Conflicts:
	Assignment1_minipaint/Debug/Test.o
	Assignment1_minipaint/Debug/makefile
	Assignment1_minipaint/Debug/objects.mk
	Assignment1_minipaint/Test.cpp