Initial commit
Merge branch 'master' of https://github.com/Ingesup-Lab-OS/OS-FileHoster

Conflicts:
	README.md
Merge branch 'develop'

Conflicts:
	README.md
Merge branch 'master' into develop

Conflicts:
	README.md