Merged current configuration along with zsh config
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitconfig
	.htoprc
	.vimrc
Removed old unused config