test
Merge branch 'master' of https://github.com/livkai/CB

Conflicts:
	src/frontend/visitors/ASTVisitor.java
	src/frontend/visitors/ASTVisitorAdapter.java