e Please enter the commit message for your changes. Lines starting
Merge branch 'master3' of github.com:schedup/schedup into master3

Conflicts:
	templates/new_event.html