master commited
Merge branch 'master' of http://github.com/shinjiescorido/grandmaster