Pied de page et captino fpga
Merge branch 'master' of github.com:strokyl/insasheep

Conflicts:
	rapport/main.tex