Update README.md
names huehue
Update names.md
Update README.md
Merge pull request #1 from AaronHammond/master

Update README.md
Updated Maria
Merge branch 'master' of https://github.com/ranman/fancy-project

Conflicts:
	names.md
Merge pull request #4 from jedestep/master

names huehue
updated names, fixed merge conflict
fixed merge conflict again