Merge pull request #43 from a1153tm/master

closed #42
Merge branch 'master' of https://github.com/NoguHiro/hacky_and_rocky
Merge pull request #48 from a1153tm/master

closed #45
close #27
Merge pull request #50 from HUMAN-FLY/master

close #27
closed #49
solved conflict of app/models/ranking_point.rb