db_module merge
incorporated db_module.rb
add Game#load
uncommenting game model
fixing merge conflict