added event
Merge branch 'master' of github.com:xlcteam/scoreboard

Conflicts:
	scorebrd/models.py
fixed merge