Editing stuff
Merge branch 'master' of https://github.com/MChesney/CSE476.git

Conflicts:
	DroidDraw/bin/classes/edu/msu/cse/boggle/droiddraw/EditActivity.class