swf path corrected
main.js generated
Merge branch 'coco_export_excel' into conflict_resolve

Conflicts:
	coco/dist/scripts/main.js
Merge pull request #16 from digitalgreenorg/conflict_resolve

Conflict resolve