edited
fix merge error
commit with changes
Merge pull request #27 from talentagentapp/adam

Adam
Merge conflicts to resolve