amulius/classtracker — pull request #11 by amulius (2014-10-16 01:15:48+00:00)
Title: Josh

fixed merge issues