Added node_modules and *.iml to gitignore
Added multiple users in settings.js
Merge pull request #194 from aaruna6/atom

Added multiple users
Merge branch 'atom' of https://github.com/Imaginea/matisse into atom

* 'atom' of https://github.com/Imaginea/matisse:
  Added multiple users in settings.js
  Added node_modules and *.iml to gitignore

Conflicts:
	.gitignore