kaisha
change ps color
add prompt settings
delete readme file
something change i dont remember
:q
^XXX^^Xlease enter the commit message for your changes. Lines starting
add search method
add some functions
set default editor
add open screen
add cakephp auto update function
change view
add scroll
change some
delete git commands
change color of prompt

Conflicts:
	.bashrc
Merge branch 'master' of github.com:wknar/dotfiles

Conflicts:
	.bashrc
	.vimrc