fixing button colors
Merge branch 'dev' of github.com:ElectricEasel/rvmulti into dev
home/resort page styling
fixing merge conflict