added gitignore
Merge branch 'master' of https://github.com/miamidade/calendar-admin

Conflicts:
	.gitignore