text in archive
Merge branch 'master' of github.com:gabergg/coffee_and_beer
precompile assets
home page touch ups
precompile assets
fix merge conflict