Markup for step 1
Markup for step 2
Test commit  kwinten
Merge branch 'master' of https://github.com/dgommers/cinema-system

Conflicts:
	Bioscoopsysteem_v1/Films.WebUI/App_Data/Cinema_Data.mdf
	Bioscoopsysteem_v1/Films.WebUI/App_Data/Cinema_Data_log.ldf
	Bioscoopsysteem_v1/Films.WebUI/Stap6.aspx
	Bioscoopsysteem_v1/Films.WebUI/Stap6.aspx.cs