delete comments in server.js, added idea to gitignore
Merge branch 'master' of https://github.com/Derpessor96/EndToEndTeamEris

Conflicts:
	server.js