server
added client
updated gitignore for node.js
Merge branch 'develop'

Conflicts:
	.gitignore