added config
no message
Merge branch 'master' of https://github.com/edunewz/artistivity

Conflicts:
	config.xml