working server - just run 'npm start'
Merge branch 'master' of github.com:antoniokaplan/bettercompany

Conflicts:
	.gitignore