Partway changes
Merge branch 'master' of git://github.com/mmutzell/Bammi
Added in vital part of addPlayer fix