changed the prompt
Merge branch 'deploy'