merging remote master
fixed UTF-8 encoding issue
merging remote master
added @import rules to manifest file
resolved merge conflict on home page
not working
index styling
states
updated
resolving merge conflicts
for the rufs
Fix weird nesting issue
not great
Sort states alphabetically
homepage styling
location.show
join us
merged
home page styling and added image files
merge conflicts