Move things arround
Merge branch 'master' of https://github.com/PabloVallejo/Str

Conflicts:
	tests/bootstrap.php