branch 2011 fixed
Merge remote-tracking branch 'remotes/origin/multiply'

Conflicts:
	main_add_v1.vi
- multiply incoorparated
. multiply added