Commit
Merge branch 'master' of https://github.com/Legendslayer/FirstWebPage

Conflicts:
	.idea/workspace.xml
	server/model/facadeTime.js
	test/backend-tests/restAPITests.js
Merge branch 'master' of https://github.com/Legendslayer/FirstWebPage

Conflicts:
	.idea/workspace.xml
	server/model/facadeTime.js
	test/backend-tests/restAPITests.js