partial commit
finished project
Merge branch 'testing'

Conflicts:
	README.md