add gitignore to remove gemfile.lock from tracking, and delete from repo
Update seeds.rb
Update schema.sql
Update boot.rb
merge conflicts fixed