TH-09 | battle effects
Merge branch 'TH-09' of https://github.com/fatimaPHP/titleholder into TH-09

Conflicts:
	application/views/main/index.php
	assets/scripts/jscripts.js