views
Merge branch 'master' of github.com:JessicaG/slice_works_clone
cleaning up cap hill and adding js files
Merge branch 'master' of github.com:JessicaG/slice_works_clone
Merge branch 'master' of github.com:JessicaG/slice_works_clone
remove wp stylesheets and using local stylesheets
fixed stylesheets for relative paths rather than absolute
fixed paths from - to _
fixed more paths removing extra /
fixed paths for menu and catering
cleaned up HTML files for catering and contact us, fixed navbar partial and added lodo location
cleaned up contact form
stuff
Merge branch 'master' of github.com:JessicaG/slice_works_clone

Conflicts:
	config.ru
Merge branch 'master' of github.com:JessicaG/slice_works_clone
changed links
links on navbar
nav bar merge conflicts
changes
Merge branch 'master' of github.com:JessicaG/slice_works_clone