Mark test 2
Merge branch 'master' of https://github.com/MartijnSmit/iKnow

Conflicts:
	iKnow/IKEmployee.m