skeleton settings
Merge branch 'master' of github.com:antoniopuero/uwc

Conflicts:
	public/css/bootstrap.min.css
	public/index.html