Merge pull request #1 from craftninja/emily_makes_changes

Emily makes changes