Minor changes to files
Merge branch 'master' of https://github.com/mmmmpark/ProjectCaringAndSharing

Added Marissa's changes