fix merge conflicts for bryan first layout changes
changes to custom.css/app.html/index.html that came with bryans layout changes
changes that would have been overwritten in site/index.html.erb  by merge
fix merge conflict in custom.css.scss
resolved merge conflict on custom.css
modify .gitignore to ignore ds_store files
merge conflicts in index & custom.css

q
remove trailing brace from bottom
change opacity to 80% on river1440.jpg