Buildcommit
Update gitignore
Merge branch 'master' of https://github.com/chrislo27/Stray.git

Conflicts:
	.gitignore
	gradlew.bat