Minor update
Merge branch 'master' of https://github.com/larsericsson/screenie

Conflicts:
	public/css/main.css
	scss/main.scss