initial
Merge branch 'master' of https://github.com/gabrieloc/endpoint-server

Conflicts:
	.gitignore