update dotfiles
fixed merge conflict
added cool symbol to prompt
added new git log