put search bar in navbar and added button classes to buttons
added a config.security key because devise told me so
fixed some annoying things in the navbar
changed some of the colmuns for Employees to make more sense
added some UI stuff to the show page, tried to seed the database and can't get seeded items to show in index, still working on that.
adding in extra stuff
Pull request from Matt
gemfile.lock merge conflict fix
Updated synonyms list
This is a merge
:w
Merge branch 'master' of https://github.com/polyfish42/PeopleDB

B

 commit.
Merge branch 'master' of https://github.com/polyfish42/PeopleDB