azd
potential solution to gitignore problem
Merge remote-tracking branch 'origin/Joe' into David
Attempting to fix gitignore
fixed gitignores for mac
removed extra gitignore
Merge branch 'David' of https://github.com/abhinavnair92/MiniPaint into David

Conflicts:
	.gitignore
	Assignment1_minipaint/.gitignore