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

filezzzz
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 pull request #28 from j3rn/develop

Unborked Gemfile
Merge pull request #27 from MarwanNakhaleh/develop

avatar mods to controller in correct spot, i hope
Add sign in and sign up links to the home page
Make Open Sans the default body font! It's awesome
Merge pull request #29 from Icarurs/develop

Add sign in and sign up links to the home page
Merge pull request #31 from j3rn/develop

Added sign in and sign out to navbar
Add footer stuff
Merge pull request #33 from Icarurs/develop

Add footer stuff
Add Compass to Gemfile, add buttons and style them on home page
Merge pull request #34 from Icarurs/develop

Add Compass to Gemfile, add buttons and style them on home page
Add more styles
Merge pull request #35 from Icarurs/develop

Add more styles
Began navbar styles
Merge branch 'develop' of github.com:TeamViperFish/HackathonProject into develop

Because I need to
Update button width shit
Merge pull request #36 from Icarurs/develop

Update button width shit
Some changes that Git won't tell me about