commit test
Merge commit 'ec8ec9ceb18f9d4a92a832fe16fda073f10599fd' into feature/add-my-name

Conflicts:
	README.md
Merge pull request #7 from Lab-317/feature/add-my-name

Merged!