Merge remote-tracking branch 'origin/master'

Conflicts:

	Telephone-Pictionary/src/com/example/telephone_pictionary/CanvasDrawer.java

	Telephone-Pictionary/src/com/example/telephone_pictionary/CanvasWriter.java