schema
Merge branch 'master' of https://github.com/natwebb/ctfleague
Merge branch 'master' of https://github.com/natwebb/ctfleague
Merge branch 'master' of https://github.com/natwebb/ctfleague

Conflicts:
	db/schema.rb
Clarified league invite email
Fixing schema git problems
Merge pull request #3 from teaguehopkins/master

Tweaking the email language.