Initial commit - DBC Sinatra skeleton
create user model, migration, seed file
Merge branch 'master' of https://github.com/mattbarackman/flashcards

Conflicts:
	Gemfile.lock
	Rakefile
	app/models/user.rb
Merge branch 'master' of https://github.com/mattbarackman/flashcards