setting up repository
Merge commit 'c2725b975eb99ed3a2fde9d02ec1db37398fd116'

Conflicts:
	README.md
set up initial functionality