added paperclip and added avatar to User model
Merge branch 'master' of https://github.com/michballard/fhellow