ignore
Merge branch 'master' of github.com:mmathias01/WoWza

Conflicts:
	.gitignore
ignore it