git flow
Merge branch 'master' of github.com:cycojesus/homeetc

Conflicts:
	zshrc