added name to README
Resolve name merge conflict

Merge branch 'master' of https://github.com/AmundsenJunior/a100

Conflicts:
	README.md