edited
fix merge error
Changes made to resolve bug issues
Bug issues resolved
commit with changes
Changes made to resolve bugs
Merge pull request #27 from talentagentapp/adam

Adam
Merge conflicts to resolve
Uneccessary route removed
Resolved merge conflicts
Resolved merge conflicts
Fix comma
Merge pull request #28 from talentagentapp/audrey

Audrey
Merge branch 'master' of github.com:talentagentapp/talent.dev into cory