testing conflicting changes
Merge branch 'master' of https://github.com/DevelopersGuild/devCal

Conflicts:
	index.html