Ignore all .DS_Store files
Temporary commit, delete later
Merge branch 'master' of https://github.com/Electroid/Maps

Conflicts:
	.DS_Store
	Quavilla/.DS_Store