more ppl
Merge branch 'master' into amy-alyssa

* master:
  Removes extra file
  Adds to yml
  Adds Eric's favorite twitter people

Conflicts:
	config/decks.yml
Merge pull request #4 from SquareCodeCamp/amy-alyssa

more ppl