Merge remote-tracking branch 'dda/pr/434' into dda-master
Cleanup some trailing whitespace.
Display player feat morale boosts
Merge remote-tracking branch 'dda/master' into dda-master
Merge Display player feat morale boosts into dda-master
Only display Masochist morale condition if there is a masochism bonus.