Removes old Android SDK Url, Removes trailing Backslash from Android Studio Path
Merge branch 'master' of github.com:kimar/dotfiles

Conflicts:
	.zshrc