Rewroked base player
Merge branch 'master' of github.com:jwils/organisms