footer

footer
Merge branch 'master' into DalmetProject

Conflicts:
	README.md