logo color change
Merge branch 'master' of https://github.com/lilyfromseattle/Rails-Far-Mar
layouts
fixed mege conflicts
merge stuff