first commit
initial merge conflict.

Merge branch 'master' of https://github.com/eshmeister/tendercare