updating guest.html
Merge branch 'master3' of github.com:schedup/schedup into master3

Conflicts:
	templates/edit.html
Merge branch 'master3' of github.com:schedup/schedup into master3
commit
Merge branch 'master3' of github.com:schedup/schedup into master3