add liquidprompt
add better php indentation
add gitconfig
Merge remote-tracking branch 'origin/master'