test
Merge branch 'Tomer'
rename
Merge branch 'Tomer'

Conflicts:
	PA1/src/IC/Parser/IC.lex