init mac
merged with mac default
merged with mac default
gitmodules
Merge branch 'master' into laptop

Conflicts:
	.zshrc
correct zshuery submodule name
Fixing mac