init test file
add db/schema.rb
update README
update readme
fix conflicts