Added defs
More comments
add if-then-else
resolving merges
removed comments
Merge remote-tracking branch 'upstream/master'

Conflicts:
	grace/lang/typecheck.rkt
Merge branch 'master' into working
Fix #29
Add new tests for classes
Merge branch 'working'