local 2
Merge branch 'master' of https://github.com/stoskov/DiffTest01.git

Conflicts:
	DiffTest01/index.css
	DiffTest01/index.html
	DiffTest01/index.js