merging some additions to artist and some bugfixes
Merge branch 'master' of https://github.com/filipdesmet/tccon

fixed conflict in artist.py

Conflicts:
	artist.py