Setting for homeshick
Add git shortcut to delete all merged branches.
Merge branch 'master' of github.com:giginet/castle

Conflicts:
	home/.zshrc