added author
fixed merge conflict with rachel's name
Merge branch 'rachel_branch'