Debug
Merge branch 'master' of github.com:Simobain/MotDit

# By Simon Robain
# Via Simon Robain
* 'master' of github.com:Simobain/MotDit:
  ok

Conflicts:
	ProjetPriseDeNote/htmlexport.cpp