1
Merge branch 'master' of github.com:kimtg/small

Conflicts:
	minicalc.rkt