first commit
NodeJS project demo
Added intellij project files to gitignore
test commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
test commit to new repo