initial commit
initial commit
Merge branch 'master' of https://github.com/tconnolly/WoWAPI.git

Conflicts:
	.gitignore