enhancement - changed assignment
confusion
Jorn fix
Merge branch 'master' of github.com:fieldtrip/playground
Update assignment.txt
fixed the assignment for Robert
Update assignment.txt
Merge branch 'master' of github.com:fieldtrip/playground
Merge remote-tracking branch 'origin/master'

Conflicts:
	assignment.txt
Merge branch 'master' of github.com:fieldtrip/playground
solved a conflict

Conflicts:
	assignment.txt