Initial commit.
Merge GithHub master branch.

Conflicts:
	LICENSE
	README.md