Goldie edited the README.
Merge branch 'master' of https://github.com/UCD-Badges-193/Badges
What the heck is going on

Conflicts:
	README.md
Merge branch 'master' of https://github.com/UCD-Badges-193/Badges
Merge branch 'master' of https://github.com/UCD-Badges-193/Badges