Initial commit
Initial commit.
Merge branch 'master' of github.com:wkerschbaumer/doc

Conflicts:
	README.md
Merge branch 'master' of github.com:cyberhouse/doc

Conflicts:
	README.md