Removed Command-T in favor of Ctrl-P
Merge branch 'master' of github.com:elguntor/home

Conflicts:
	.gitignore