Painting brushes on the image
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Pointillism/src/main/java/com/realityexpander/pointillism/MainActivity.java
	Pointillism/src/main/res/layout/activity_main.xml
Merge remote-tracking branch 'origin/master'
Painting brushes on the image