# WARNING: head commit changed in the meantime

Merge branch 'master' of
https://github.com/Karl-Queckfeldt/HelloCompiler.git

Conflicts:
	src/node/Int.java
	src/node/Operator.java
Nytt shiz
Merge branch 'master' of
https://github.com/Karl-Queckfeldt/HelloCompiler.git

Conflicts:
	src/node/If.java