?
Merge branch 'master' of github.com:bondarewicz/anchor-client

Conflicts:
	Tests/bootstrap.php
OK (1 test, 20 assertions)
Merge branch 'master' of github.com:bondarewicz/anchor-client

Conflicts:
	Tests/bootstrap.php