gitignore
Merge branch 'master' of https://github.com/Wafflewrath/lo18_utsh

Conflicts:
	.gitignore