my changes
Merge branch 'master' of https://github.com/mmquint/CS279_FinalProject_MQ_VB