edited
Merge branch 'master' of https://github.com/redcliff/Assignment

Conflicts:
	myinfo.txt