r
Merge branch 'master' of https://github.com/N4utilusS/ltc2.git

Conflicts:
	src/main/ParsSemanticAnal.java
Merge branch 'master' of https://github.com/N4utilusS/ltc2.git

Conflicts:
	entree.txt
	src/main/ParsSemanticAnal.java
Derp herp