fixed if statement parse errors
Merge branch 'semantic'

Conflicts:
	src/semantic.rb