basic layout
Merge branch 'staging'

* staging:
  basic layout

Conflicts:
	.gitignore