Stupid ignores
WHY GIT DO YOU HATE ME
Merge branch 'master' of github.com:atomicrat2552/codeweaver

Conflicts:
	.gitignore
	log/development.log