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'..."
updated student info for amyll001
Update README.md
Update dpham008
Update dpham008
Merge pull request #1 from mikeizbicki/cs100-2014fall

Got up to date files
Added student 'Kevin Chan'
enrolling in cs100
added khuan013 to people
added personal info into student repo
enrolling in cs100
Merge pull request #200 from amyll001/cs100-2014fall

updated student info for amyll001
Create atan009
added gliu016 file
Corrected "bugfix" to "master" under merge conflict section of README
Added Adam Fan's info
Merge pull request #197 from ChemicalWonders/cs100-2014fall

Added student 'Kevin Chan'
Merge pull request #198 from Liniarc/cs100-2014fall

enrolling in cs100