readme
Merge branch 'master' of https://github.com/sahuguet/govlab-intranet

Conflicts:
	README.md