add calendar ok
Ignoring DS_Store files
Merge branch 'agenda'

Conflicts:
	app/assets/.DS_Store