added artist to music, changed back to sqlite
Updating heroku
Merge branch 'master' of https://github.com/DSegal92/341Project

Conflicts:
	Gemfile.lock