Update code from this morning
Merge branch 'master' of https://github.com/vsrz/CS542