names huehue
Merge branch 'master' of https://github.com/ranman/fancy-project

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

names huehue
Merged names