changes from stash
styling and CRUD complete
Merge pull request #13 from jghezzi/rick

Rick
fixed conflicts
Merge branch 'jeremy_working2'
a few adjustments; fixed search