Merge branch 'master' of https://github.com/ThrostGunnulf/iJavaC

Conflicts:
	ijparser.tab.c
	ijparser.tab.h
	ijparser.zip
	lex.yy.c
Foda-se

fds
Merge branch 'master' of https://github.com/ThrostGunnulf/iJavaC

4b4f07db5b93, reversing
changes made to 3d239e9027c5dfaa64f1b83830f1be8f17164b29.