post it en cours
Merge branch 'master' of https://github.com/bchegara/babyboardSite

Conflicts:
	src/main/java/com/mycompany/babyboardsite/View/BabyboardView.java
merge

conflict