fusion map on landing page
Merge branch 'master' into working-branch
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
new background image rivers1680.jpg
add new image to commit log
merge conflicts btwn master and working-branch
clean up css, style pagination links
remove state info div & resize map, change td width to auto
fix merge conflict with foundation-monday
Merge pull request #18 from BryanWahlstrom/master

Round 3 layout changes
merge d3-play branch with changes to rivers/index.html page
add <br> above pagination on rivers/index.html