Bash on server.
Merge branch 'master' of github.com:dilawar/Scripts

Conflicts:
	bashrc