new commit with rep
Merge branch 'master' of https://github.com/romerosh/moc_testing

Conflicts:
	bin/app/Main.class
	src/main/app/Main.java