pulling
pulling
Merge branch 'master' of git@github.com:rtheunissen/KPSmart-Team-4.git

Conflicts:
	logs/log.xml