added dump.rdb and /public/assets to gitignore
js fix to make user profile charts work again
changes to post div formatting
basic div formatting has progressed
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