Finished layout and routes
test.log
Merge branch 'filling-in-layout'

Conflicts:
	log/test.log