Merge branch 'master' of https://github.com/crystaldou/GraceTunes

Conflicts:
	Gemfile.lock
mod
mod2
Merge branch 'master' of https://github.com/crystaldou/GraceTunes
fix button bug