merged
Merge branch 'master' of
https://github.com/nickolayrusev/MongoDbDataProject.git

Conflicts:
	MongoDBDataProj/src/main/java/org/mongo/controller/HomeController.java