new branch for mac book ara.
delete git alias and add coffee env
increase history
add zshrc
add alias
update prompt view added view

Conflicts:
	.bashrc
Merge branch 'mac_book_ara' of github.com:wknar/dotfiles into mac_book_ara
change color of prompt
Merge branch 'mac_book_ara'

Conflicts:
	.bashrc
	.vimrc