messing around with border
Merge branch 'master' of https://github.com/inoda/you-owe-me-homie into pending-table
fixed tests
Merge branch 'master' of https://github.com/inoda/you-owe-me-homie into pending-table