added comments and things
Merge branch 'master' into work

Conflicts:
	lab01.rkt~