v6home
Merge branch 'master' of github.com:sstrazan/testrep

Conflicts:
	init.txt
v7home
Merge branch 'master' of github.com:sstrazan/testrep

Conflicts:
	init.txt