added paperclip files
added paperclip files
Revert "add delete channel functionality to channel's show page"
reverted

This reverts commit 6275b352a5a0acd1134b557b49df99c7ccff73f3.
fixed issues with paperclip files
Merge http://github.com/enylund/project1
merge conflict
Image upload functionality. Must installImageMagick ON VAGRANT. (sudo apt-get install -y imagemagick)
changed login logout routes, can sign in from anywhere, signing in or out leaves you on same page, some debugging when not logged in
fix merge conflict
link to edit profile