fixed some fight  view shit
Merge branch 'master' of https://github.com/LarryBrid/lootgrind

* 'master' of https://github.com/LarryBrid/lootgrind:
  Added fight form and template

Conflicts:
	testing