Maria & Guangliang - FIX IT!
Merge branch 'master' of https://github.com/MariaBarrett/VIPAssignment3