fixed missing comma in db schema; added shoulda gem;  added failing tests for problem model
db conflict merge