AHAHA COMMIT(té d'accueil!)
Merge branch 'master' of https://github.com/tbmc/NoMoreFloppy

Conflicts:
	vueconsole.h