ran db:migrate and fixed through
Merge branch 'developer' of github.com:SCarJAY/closet_app
some seeds
Merge branch 'developer' of github.com:SCarJAY/closet_app
added some data in seed file
user crud success
fixed merge issues
Merge pull request #4 from carriexu/master

added restful routes for user
Rectifying item controller issues
Merge?
Merge conflict fixesAuthorization => token
Completes seven deadly routes for users/items
add dashboard with its routes & genreate
Merge pull request #5 from yinansong/master

Add Dashboard with Routes & Generate Page
adds welcome controller
adds model tests for item
adds model tests for outfits
adds model tests for user
adds tests for relationship with items and outfits and secure password test
adds belong to and have many tests