a few changes
Merge branch 'master' of https://github.com/MChesney/CSE476.git

Conflicts:
	DroidDraw/res/values/strings.xml