main.js generated
Merge branch 'coco_urlfix_enablemonth' into resolve_conflict

Conflicts:
	coco/dist/scripts/main.js
Merge pull request #15 from digitalgreenorg/resolve_conflict

Resolve conflict