Merge pull request #5 from electric/master

Bugfix: Ordering on character page
Revert "Bugfix: Ordering on character page"
Merge pull request #6 from lukafaxx/revert-5-master

Revert "Bugfix: Ordering on character page"
Test
Revert Test
Fix 3rdstrike alex super art
Update README.md
Fix terminology
Fix sidebar conflict for active item
Add usf4 poison
Add usf4 hugo
Fix note
Add usf4 makoto