cicadas-2014/percolator — pull request #13 by gitnasty (2014-07-04 01:30:38+00:00)
Title: Fix merge conflicts

###Config
`fix route to reflect problems#index as the root

###Test environment
`delete dlog

###Models
`add user association validation to problem model
`add has_secure_password to user model