testing stuff

added someting, not sure what
Merge branch 'master' into adding-index

Conflicts:
	.DS_Store