Update user.rb
Merge pull request #5 from auroranou/master

db folder
db and models dir clean up
migrations for table creation
Merge pull request #6 from JackVCurtis/master

migrations for table creation
Update 20141212203144_create_users.rb
commit migration files
resolve migration file merge conflicts
Update 20141212203150_create_user_items.rb
Merge branch 'master' of github.com:dkulas/GIFTY
added model associations
fix syntax error on group migration file, add schema.rb
Merge pull request #7 from JackVCurtis/master

added model associations
Merge branch 'master' of github.com:dkulas/GIFTY
add require_relative files to app.rb
updated app.rb