added name to readme
Drew
Edited README.md to instigate conflict
Merge branch 'master' into readme_schrock
Merge branch 'master' into drew_branch

Conflicts:
	README.md
Merge pull request #36 from githubschool/drew_branch

This is an amazing change
fixing conflicts
Merge pull request #35 from githubschool/readme_schrock

Mitchell's name added to readme.
Merge branch 'readmeEdits'

Attempted to resolve merge conflict.

Conflicts:
	README.md