add my name
Merge branch 'master' of https://github.com/-1ck/test

Conflicts:
	AUTHORS