Merge branch 'master' into master-2

* master:
  a bit more tweaking
  bootstap232
  first
  first

Conflicts:
	README
	css/style.css
	humans.txt
	index.html