Catches up this branch to parent branch
You wanted columns! Here they are!
Merge branch 'cols1' into diagram1

Conflicts:
	static/diagram.js

See https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line
it was all in the text editor