Installing Autotests
Fixing autotest
Merge branch 'filling-in-layout'

Conflicts:
	Guardfile