Merge branch 'master' of https://github.com/dabwork/empire-client

Conflicts:
	a.txt
'test'