Started work on the layout and include framework
Resolve merge conflict with README

Conflicts:
	README.md