did some more stuff
let's see if this works
Merge branch 'chelsea' into Dev
pull this
fixed google font merge issue
fixed merge errors
update
removed * border
reservations box
res table
added maxs javascript
Merge branch 'Dev' of github.com:emorygriffith/Spiked into Dev
Merge branch 'Dev' into maxdev
added Andrews menu sripts