Test file
Removed Test file
Small grammar edit

Changed word from, "...it doesn't know which parts to keep from 'uesrinput'..." to "...it doesn't know which parts to keep from 'userinput'..."
Update README.md
Update dpham008
Update dpham008
added personal info into student repo
enrolling in cs100
Create atan009
added gliu016 file
Corrected "bugfix" to "master" under merge conflict section of README
Added Adam Fan's info
added Leon Peng to students
added hchu007 into people/students
added ahsu013 information file
added student info
Merge pull request #201 from bchen022/cs100-2014fall

enrolling in cs100
made my student file
added rluk001 to students
Added student information.