Hanami contributors

All javierav commits

Cleanup duplicate codehanami
Fix typo in READMErouter