Merge pull request #15 from BryanWahlstrom/master

disable scrolling on front page map
adjustments to custom.css, app.html & index working to adjust styling
Merge branch 'master' of https://github.com/Patrickmnts/FlowFree into Upstream-master
Merge pull request #16 from BryanWahlstrom/master

First round of layout changes
fix merge conflicts for bryan first layout changes
changes to custom.css/app.html/index.html that came with bryans layout changes
Merge pull request #17 from BryanWahlstrom/master

Second round of 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
fix merge conflicts in site/index, custom.css & app.html.erb working to fix origin deverge issue
Merge branch 'master' of https://github.com/Patrickmnts/FlowFree
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
clean up css, style pagination links
fix merge conflict with foundation-monday