new measures
Merge branch 'project2'
% discount