ignore .idea files
Merge branch 'master' of https://github.com/htmelvis/canvasResizer

Conflicts:
	.gitignore