Merge pull request #26 from peasantpalate/master

Modal should work with form_for
having problem with carrierwave
comments append itself to the corret div
Merge pull request #27 from jongmini/fixing_comments

Fixing comments
Delete .env
added sidekiq
sidekiq added. AWS code moved to imagesworker
Merge pull request #28 from jongmini/sidekiq

Sidekiq
config.assets.compile = true
Merge pull request #29 from brucetoddlee/heroku_changes2

looks good.
posts comments likes are linked to current_user
Merge pull request #30 from jongmini/user_likes

posts comments likes are linked to current_user
new post modal
commiting more files
trying to merge again
Merge pull request #32 from jongmini/joels_change

Joels change
update
Merge branch 'master' of github.com:brucetoddlee/good_or_evil
merge conflicts
resolved conflicts