Added conflict3
Merge branch 'master' of https://github.com/gisti92/proba.git

Conflicts:
	src/proba/Proba.java