Fixed some minor bugs
Merge branch 'master' of https://github.com/Fippe94/openEtG

Conflicts:
	server.js