Merge branch 'master' of git://github.com/Jeffrey04/mjcount into Jeffrey04-master
Merge branch 'Jeffrey04-master'