bug fix
ingore files
Merge branch 'master' of https://github.com/kevinluosl/montage-jschart

Conflicts:
	.idea/workspace.xml