Initial commit
reset folder

Conflicts:
	README.md