Auto commit from doc editor
Merge branch 'master' of github.com:c2is/BigfootDoc

Conflicts:
	en/chapter2.skriv
	html/en/chapter2.html