ugh... has_attached_file :avatar for user and parameters in welcome controller
rails g paperclip etc... connecting this bastard to the user
Gemfile.lock crap
Merge pull request #21 from j3rn/develop

Fixed the Gemfile issue with the Avatar feature
ughhhh.
removed avatar stuff from the welcome controller, since it doesn tbelong there
Merge pull request #24 from MarwanNakhaleh/develop

gotta re-do avatar cause we're trying to find devise's controller
Merge pull request #25 from j3rn/develop

Fixed Hamify stuffs
Merge pull request #26 from j3rn/develop

Added Devise views