whoops
Merge branch 'master' of github.com:jbakse/comb_script

* 'master' of github.com:jbakse/comb_script:
  working on preview styles

Conflicts:
	src/index.html
	src/javascript/Settings.js