Ever get so frustrated you just hard code stuff in

That's my night.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Telephone-Pictionary/src/com/example/telephone_pictionary/CanvasDrawer.java
	Telephone-Pictionary/src/com/example/telephone_pictionary/DrawingTools.java