style updates
style updates
merged with GReg
style and logic updates
style and logic updates
nav bar and items
Syle css updates
style updates
new background image
mergetool fixed conflicts in application.css