IT'S WORKINGGG!!!!11
Merge branch 'master' into it_wors

Conflicts:
	server/index.html
	server/server.js