sinc with repo
Merge branch 'master' of https://github.com/AlexKund/newProject

Conflicts:
	data/mongod.lock
	public/core.js