..
Merge branch 'master' of
https://github.com/tristanrichard/Distribuerede.git

Conflicts:
	Server/bin/.gitignore