git ignore
initial commit
Merge branch 'master' of https://github.com/ryudice/QuatzNetAPI

Conflicts:
	.gitignore