add comfig file
Merge branch 'master' into heroku
Merge branch 'master' into heroku
post layout
update gemfile
Merge branch 'development'