small changes
Merge branch 'master' of https://github.com/nachosgrande/System-Prototype

Conflicts:
	bin/ctc/Ctc.class
	src/ctc/Ctc.java

merging
updated gui