Fixing conflicts
Delete scaffold html
CSS
Merge branch 'master' into Sarida

Conflicts:
	css/screen.css
	index.html
	scss/screen.scss