Continued work on drawing
Merge branch 'master' of https://github.com/Wyattjoh/TaggingApp

Conflicts:
	project.properties