new couchdb
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	routes/user.js
Procfile
stuff
again
funka
aded node info
added node and npm version
ge
removed extensions