first commit
Merge branch 'master' of https://github.com/blackaplysia/mirror

Conflicts:
	README.md