ignore some file
Merge branch 'master' of https://github.com/kevinluosl/montage-chartjs

Conflicts:
	.idea/workspace.xml