added my information
Merge pull request #170 from npsark/cs100-2014fall

added my information