student and some changes
more changes
valk meeting updated
aaa

Conflicts:
	report/content/Businessplan/Sales_and_marketing.tex
	report/content/Businessplan/customer_and_market.tex