Update styles
Merge branch 'master' of github.com:atongen/owc

Conflicts:
	app/assets/stylesheets/screen.css
	static/public/styles/screen.css