u
Merge branch 'master' of https://github.com/guillaume-gouchon/angelpal

Conflicts:
	server/app.js
	server/models/index.js