new calc2
Merge branch 'master' into branch2
Merge branch 'master' into branch2
initial checkin
init blocks
Merge branch 'master' into branch2
measures
Merge branch 'branch2'
calc1
calc1
reset