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
Fixed the Gemfile issue
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
Fixed schema conflict
Merge pull request #25 from j3rn/develop

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

Added Devise views
avatar mods to controller in correct spot, i hope
Merge remote-tracking branch 'upstream/develop' into develop

filezzzz
Unborked Gemfile
well shit, let's try editing the avatar stuff for the controller and everything like this... why, devise, must you be so... what's the word...
Merge branch 'develop' of github.com:TeamViperFish/HackathonProject into develop
Added a partial for the navbar so Jon can work on it
Merge pull request #28 from j3rn/develop

Unborked Gemfile
Merge pull request #27 from MarwanNakhaleh/develop

avatar mods to controller in correct spot, i hope