confusion
Merge remote-tracking branch 'origin/master'

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