asdfljk
Merge branch 'master' into addPhotoStyling

Conflicts:
	kARTography/bin/classes/kartography/app/MainActivity.class
	kARTography/bin/classes/kartography/app/R$drawable.class
test commit
Merge pull request #43 from koalahamlet/addPhotoStyling

Add photo styling