new layout
test 2
Merge branch 'master' of github.com:irene-dh/BeepBeep

Conflicts:
	TODO
	uk_typical_scenario.php
aaa