i added my name!
Merge branch 'jeremylittel'
jeremy
Merge branch 'master' of https://github.com/A92hm/Git-Test

Conflicts:
	name.txt