Tidy up
Update
Merge branch 'master' of https://github.com/gregoryzuckerman/githubicons

Conflicts:
	.DS_Store