back to the future
Merge branch 'master' of github.com:chrrrles/digital_tip_jar

Conflicts:
	digitial_tip_jar/artist.py