First commit
Merge branch 'master' of github.com:thaichor/apidoc

Conflicts:
	.gitignore