Added a small selection of colourschemes, file icons, etc to aid in customisation.
resolved conflict
Merge branch 'master' of https://github.com/scottpunshon/dotfiles

Conflicts:
	colours/iterm2/Thayer Bright.itermcolors
	colours/iterm2/Tomorrow Night Bright.itermcolors
	iTerm2/Solarized Light.itermcolors