control
Merge branch 'master' of https://github.com/cnberg/Qing

Conflicts:
	src/Layout.js