Merge origin/master

Conflicts:
	src/militarescompare/Main.java