chihiro + rosemary updates
Merge branch 'master' of https://github.com/CMUCodeGoddess/CodessHackath

asdfghjkl