Added .DS_Store to be ignored.
Merge branch 'master' of https://github.com/NicholasTD07/DotFiles
Changed the order and added alias.
Merge branch 'master' into server

Conflicts:
	.gitconfig