Conflict
Merge branch 'master' of ssh://git@github.com/Gert-Vilain/teamB.git

Conflicts:
	teamB/src/main/java/be/kdg/teamB/App.jav