JAVA version into JS version
Merge branch 'master' of https://github.com/SquadraCorse/node-app

Conflicts:
	lib/xhr.js
	server.js
	views/partials/header.hbs