Enabled right prompt for master branch
Enabled copy paste by using control+shift+shortcuts
Merge branch 'master' into vertigo

Conflicts:
	zshrc