Removed all traces of images from schema
Merge branch 'develop' of github.com:TeamViperFish/HackathonProject into develop

Because it's better
Added Image scaffold
Added Paperclip stuff to Image model
Added file field for image upload
Removed unnecessary 'attr_accessible' from Image model
Made image show actually show the image
Cleaned up routes
Added active record associations
Added user_id to image
Added user_id to schema and made use of associations in the image controller
Merge pull request #53 from j3rn/paperclip

IMAGES
Add logged in user information to the navbar
Merge pull request #54 from Icarurs/develop

Add logged in user information to the navbar
Merge remote-tracking branch 'upstream/develop' into develop

"Because I said so."
Remove scaffold and update the navbar css
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #55 from Icarurs/develop

Navbar edits
Merge remote-tracking branch 'upstream/develop' into develop
Remove the freaking scaffold.css