basic design of application layout
Finish layout and routes
Merge branch 'filling-in-layout'

Conflicts:
	.settings