Merge branch 'master' into David
Merge branch 'master' into David
random changes
Added branches
Merge branch 'David' of https://github.com/abhinavnair92/MiniPaint into David
Merge branch 'David' of https://github.com/abhinavnair92/MiniPaint into David

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