Styling updates
Merge branch 'master' of github.com:buhhy/launch

Conflicts:
	css/editor.css