Little sync
Merge branch 'master' of https://github.com/Elbone/demos

Conflicts:
	.gitignore
	demo-1/css/dumb.css
	demo-1/css/large.css
	demo-1/css/medium.css
	demo-1/css/small.css
	demo-1/images/header-1.gif
	demo-1/images/icons-2@2x.gif
	demo-1/index.php
	demo-1/resources/header-1.ai
	demo-1/resources/header-2.ai
	demo-1/sass/_setup.sass
	demo-1/sass/medium.sass
	demo-1/sass/small.sass
	demo-1/setup.php
	demo-1/templates/medium.php
	demo-1/templates/small.php