...
Delete Shipping Costs

Merge branch 'master' of https://github.com/marmuel/shiny-octo-cyril

Conflicts:
	js/mylibs/script.js
add function discount
add function shipping
add autosize textareas