2
Merge branch 'master' of https://github.com/stixos/test into second

* 'master' of https://github.com/stixos/test:
  2

Conflicts:
	1 - Copy.TXT