no message
Merge branch 'Beta' of https://github.com/maxime1992/ndl_haskell_ere into Beta

Conflicts:
	Code/application/views/accueil_view.php
Merge branch 'Beta' of https://github.com/maxime1992/ndl_haskell_ere into Beta

Conflicts:
	Code/application/views/accueil_view.php