Edited myinfo file
Merge conflicts

Conflicts:
	myinfo.txt