bad merge
Merge branch 'parser' of github.com:C4ptainCrunch/ics.py into parser

Conflicts:
	ics/icalendar.py