Merge pull request #11 from jcao219/master

merge changes
Merge branch 'master' of https://github.com/niranjanravi/Assignment-4