icons
Merge branch 'master' of https://github.com/star-one/quaker-poems

Conflicts:
	config.xml