fixed the assignment for Robert
Merge branch 'master' of github.com:fieldtrip/playground
solved a conflict

Conflicts:
	assignment.txt
ownfork
Merge branch 'master' of git@github.com:fieldtrip/playground