Merge remote-tracking branch 'origin/master'
Added osx
Merge remote-tracking branch 'cristian/master'

Conflicts:
	templates/.zshrc
Muni sucks