icons
Splash Image
Merge remote-tracking branch 'origin/master'

Conflicts:
	Pointillism/src/main/java/com/realityexpander/pointillism/MainActivity.java