work in progress
readme
testfile
stripe error message
resolving git confict