added employee.html.erb
fixed conflicts
Merge branch 'master' of github.com:ardmore/website
added cache to clients/index.html.erb