Added my name!
add name
Add name
Merge branch 'master' of https://github.com/EtonCollegeTechClub/git-practice

Conflicts:
	CREDITS.txt