userstate ignored
userstate ignore
Merge branch 'master' of https://github.com/CapsNo94/Omikron

Conflicts:
	.gitignore
gitignore merge