Merge remote-tracking branch 'origin/teacher_grade_map'
conflict with assesment
Merge remote-tracking branch 'origin/uma'
added rejected to approvals, showing edit, delete and new links before aprove, auto fill pdcs on creation
database.yml
javascript asset failing at heroku trial-1
conflicts
Merge remote-tracking branch 'origin/master'