test2
Merge branch 'master' of https://github.com/Kacper86/Alfa

Conflicts:
	JavaProject/src/com/test/javaproject/Main.java