Merge branch 'deprecate_screen_containers'

author Mark Otto <otto@github.com>

Sun, 1 Sep 2013 09:05:14 +0000 (11:05 +0200)

committer Mark Otto <otto@github.com>

Sun, 1 Sep 2013 09:05:14 +0000 (11:05 +0200)
author Mark Otto <otto@github.com>
Sun, 1 Sep 2013 09:05:14 +0000 (11:05 +0200)
committer Mark Otto <otto@github.com>
Sun, 1 Sep 2013 09:05:14 +0000 (11:05 +0200)
diff --cc customize.html
Simple merge
diff --cc less/variables.less
Simple merge
author	Mark Otto <otto@github.com>
	Sun, 1 Sep 2013 09:05:14 +0000 (11:05 +0200)
committer	Mark Otto <otto@github.com>
	Sun, 1 Sep 2013 09:05:14 +0000 (11:05 +0200)
		1	2
customize.html	patch \|	diff1 \|	diff2 \|	blob \| history
less/variables.less	patch \|	diff1 \|	diff2 \|	blob \| history