first commit
Merge git://github.com/xmpf/cupscores