test
Merge branch 'filling-in-layout' of github.com:fratboy/sample_app into filling-in-layout

Conflicts:
	.idea/workspace.xml