finished pay_me version 0.0.1, tests needed
updated descriptions
fixed conflicts