Merge branch 'master' of github.com:brucetoddlee/good_or_evil
Merge branch 'master' of github.com:brucetoddlee/good_or_evil
Merge branch 'master' of github.com:brucetoddlee/good_or_evil
assets folder
Merge pull request #54 from ydarbleoj/photo_adjust

Photo adjust
added dump.rdb and /public/assets to gitignore
js fix to make user profile charts work again
Delete .env
changes to post div formatting
basic div formatting has progressed
wtf
rafi fixed joels computer
Merge remote-tracking branch 'upstream/master' into fixing_newsfeed
Merge pull request #55 from brucetoddlee/update_gitignore

added dump.rdb and /public/assets to gitignore
Merge pull request #56 from brucetoddlee/user_profile_js_fix

js fix to make user profile charts work again
initial seed file changes
resolved conflicts
modifications
removed binding.pry from posts controller
Merge pull request #58 from brucetoddlee/remove_binding_pry

removed binding.pry from posts controller