Add price parameter for display and sum.
Merge branch 'master' of github.com:sangisos/labb15

Conflicts:
	labb15.sml