Fix
Merge branch 'master' of https://github.com/republikanac/zeto

Conflicts:
	stylesheets/screen.css