Updated basic template.
Merge branch 'mac' of github.com:tatuas/.MySettings into mac

Conflicts:
	.bashrc