noting
Merge branch 'master' of https://github.com/Reizorc/test1

Conflicts:
	test1.layout