I have no idea what I'm doing
Merge pull request #1 from NullVoxPopuli/master

CrossoverJJ
added link to competitino information
Remove unneeded `if` statements from Competitions report.
Update registration form to support CrossoverJJ.
Merge branch 'master' of git://github.com/brucep/regsys

Conflicts:
	views/FormRegister.html