27 commit: comment//error heroku
Merge branch 'master' of github.com:gudaru/online_music

Conflicts:
	app/controllers/musics_controller.rb
28 commit: coment//error version ruby heroku