c finished
Merge branch 'master' of http://github.com/livkai/CB

Conflicts:
	src/frontend/visitors/CILGeneratorASTVisitor.java
4 finished