sort of stuff
Merge branch 'master' of https://github.com/phuyalbiswa/paintExteme

Conflicts:
	res/layout/main.xml
Merge branch 'master' of https://github.com/phuyalbiswa/paintExteme

Conflicts:
	res/layout/main.xml