Initial commit
Merge branch 'master' into eric

Conflicts:
	README.md