Added two base classes
Merged branches

Merge branch 'player' of github.com:ustreetTDG/anntbr into player