Merge branch 'master' of C:\Users\Joseph\AndroidStudioProjects\DrawThingsHackathon with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/jaks/alvarp/drawthing/DrawingView.java
Merge remote-tracking branch 'origin/master'
Editted XML for text field