remove ds_store junk
Merge branch 'master' of github.com:jdgarvey/schenker-micro

Conflicts:
	images/.DS_Store