General code cleanup
Merge branch 'master' of https://github.com/foxannefoxanne/TelephonePictionary

Conflicts:

Telephone-Pictionary/src/com/example/telephone_pictionary/CanvasDrawer.j
ava