edited ast_if
Merge branch 'master' of http://github.com/hbrice/homework4

Conflicts:
	program.sml
ast_if still not working
Merge branch 'master' of http://github.com/hbrice/homework4

Conflicts:
	program.sml