changed author information
Merge branch 'master' of https://github.com/rothgar/msit555