bla

bla
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.xml
Merge branch 'master' of https://github.com/gait206/Vos-en-Vos-Project