Removing 'final solution'
Merge branch 'master' of github.com:SpotOnDev/artistsline