Resolved merge conflicts
Merge pull request #30 from talentagentapp/audrey

Minor updates to file