Update assignment.txt
Merge branch 'master' of github.com:fieldtrip/playground

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