Merge origin/master

Conflicts:
	.gitignore
	src/marriors/Marriors.java