mg
Merge branch 'master' of https://github.com/dioklecijan/FirstProject

Conflicts:
	server/storeCheckDataObject.js