b1
Merge branch 'bar1'

Conflicts:
	TestAutoLayout3/TableViewController.swift