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

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

fds