Added new prompt
Corrected new prompt
Merge branch 'newprompt'
Fixed .emacs file
Removed +x flag from bash_prompt
Corrected aliases