conflicts
fix conflicts
conflicts
precompile
taking out imgs
procfile and unicorn
gemf
ruby vers
img back
fb auth
fix conflict recipe page
Merge branch 'master' into social