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?