delete.ds_store
Merge branch 'master' of https://github.com/forDaniel/Spring

Conflicts:
	.DS_Store