Initial commit
Pull in initial code

Conflicts:
	README.md
README update