a
Merge branch 'master' of https://github.com/screenm0nkey/test into master1

Conflicts:
	added copy.txt