commit migration files
resolve migration file merge conflicts
Merge branch 'master' of github.com:dkulas/GIFTY
fix syntax error on group migration file, add schema.rb
Merge branch 'master' of github.com:dkulas/GIFTY
add require_relative files to app.rb
updated app.rb
more updates to app.rb sign up and log in functions
Merge pull request #9 from auroranou/master

add app.rb