Merge origin/master

Conflicts:
	.gitignore
	src/main.java
Merge origin/master