outline footer
create  blocks Inner and Medium
Merge branch 'master' of github.com:valenitin/urbandecay

Conflicts:
	.idea/workspace.xml
	.idea/www.iml