Unborked Gemfile
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
file upload stuff; controller, view, model, everything... hopefully this works