temporary until merge with master
Merge branch 'coco'

Conflicts:
	Plan It/main.py
	Plan It/templates/base.html
	Plan It/templates/event.html