merge
weird permission error correction
Paperclip working for images and avatars
Merge branch 'development' of github.com:deereb/competitive_instagram into development