Merge pull request #2 from leeju/master

Add Photo, User models and migrations, Faker gem, Shoulda-Matchers gem, tests for PhotosController
integrated simplecov and fixed file organization
added associations and added controllers for comments and votes
redo seed file
Merge pull request #3 from alanflorendo/seed_file

redo seed file
added controllers for sessions and users
Add Sass
Merge pull request #4 from leeju/sass

Add Sass
added user auth, sessions controller working, started nav bar with login/logout
revert to old commit, plus add css
selective nav bar based on current_user
reset css
Merge pull request #6 from alanflorendo/master

revert to old commit, plus add css
remove extra css files
added gitignore
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/imgur-jr into users
Merge pull request #7 from alanflorendo/master

remove extra css files
Merge pull request #5 from eshem/users

Users
added rspec for votes controller
fixed merge conflict