Merge pull request #34 from elElmo/master

Merged prompt_user with prompt_deploy_reserves
Merge remote-tracking branch 'upstream/master'