zsh is pretty cool I gotta admit
added this git stuff but I dont think I ike it
lol
fixed time format
Merge remote-tracking branch 'upstream/master'

Conflicts:
	vim/vimrc.symlink