remove transparency
Remove junk file
Add smartindent
Update vim files
Merge remote-tracking branch 'origin/mac' into mac
Add line highlight
Merge branch 'mac' of github.com:keyvanfatehi/config into mac

Conflicts:
	.vimrc
add jekyll
commit