close #2

show git dirty to the prompt
Merge remote-tracking branch 'origin/master'