Merge pull request #38 from jeong-codefellows/master

facebook edits / merge conflicts