Merge pull request #1 from sephii/master

Cleanup some stuff
add custom form for result input
make sure winner and loser is not the same person
add functional tests