Edited Yo
Merge branch 'master' of github.com:Buntuu/test1

Conflicts:
	info.txt