Re-ran generate.
Settled Merge Conflicts.
Merge branch 'master' of http://github.com/LukeShu/leaguer