initial
Merge branch 'master' of https://github.com/JAStanton/DocBlock

Conflicts:
	README.md