Merge branch 'master' of https://github.com/LitQoo/GraphDog

Conflicts:
	.DS_Store
ss