added user info
Merge pull request #190 from danielngo/cs100-2014fall

added user info