testing
testing 2
Merge branch 'master' of github.com:alintimu/cham-runner

Conflicts:
	src/Controller/MainController.java
Final v1.0
v1.1 Start
Mother of all programs