Removed auxiliary scaffold css
Update
Merge branch 'master' into Sarida

Conflicts:
	index.html
	scss/screen.scss
Removing extra css
Merge branch 'master' into Sarida

Conflicts:
	css/screen.css
	index.html
	scss/screen.scss
Merge pull request #3 from Diazenylium/Sarida

Edit CSS