I did the deed where you need me to have greed

Change-Id: I8979d705d9e2e212075f0ce3012232c5e3b7e1da
Merge branch 'master' of
ssh://git@github.com/coldwarrior5/Language-processor.git

Conflicts:
	Language processor/src/hr/unizg/fer/lab3/SemantickiAnalizator.java

Change-Id: I7c74501d0c3f3bab20239be938ec7531fd2b5338