Alias
Vimrc. xdebug and android
Merge branch 'master' of github.com:andreasrs/configs

Conflicts:
	zsh/.zshrc