initial commit
adding file 1
Merge branch 'newReadme'

Conflicts:
	README.md