Need to pull in meme views.
Pulled in most recent files. Resolved merge conflicts.
user sign up and sign in specs finished
added sign out test
Passed test for editing a user account.
Passed tests for editing a user account.
added cancel account test
corrected style issues with ruboocop
deleted useless test
uncommented review tests..
fixed via pull request comments
solved merge conflicts for devise branch
Merge pull request #7 from jacindaz/devise

devise...complete?
migrated
Merge branch 'master' of https://github.com/jacindaz/meet_the_memes
Fix some failing tests.
all tests passing now, need to add user_id's to memes and reviews, and add testing for that
added user_id columns, user_id set in controllers, models have proper associations
ER diagram displays in readme
Merge pull request #8 from jacindaz/fix_failing_test_suite

Fix failing test suite