Initial commit
Merge branch 'refs/heads/master_new'

Conflicts:
	README.md