Merge pull request #2 from caseymhunt/master

Adding Rachel's stuff
Merge remote-tracking branch 'upstream/master'