Merge branch 'hotfix/Julian_in_credits'
Update README.md
ignore some moar
Merge branch 'master' into develop

Conflicts:
	.gitignore