Tauros added
Merge remote-tracking branch 'origin/master'
Merge pull request #781 from LightAdept/master

Tauros
Colored HP bars.
Merge pull request #783 from Zariu/master

Colored HP Bars
Fixed bonemeal causing crash
made it so if in a battle with another player and they drop the battle ends
Merge remote-tracking branch 'Masterbranch/master'