Initial commit.
commit
Merge branch 'test' into unstable

Conflicts:
	.gitignore
	README.md