mm
mm
mm
Merge branch 'master' of https://github.com/crystaldou/GraceTunes
minor change to update method
Merge remote-tracking branch 'origin/master'

Conflicts:
	.DS_Store