.DS_Store
Merge branch 'master' of https://github.com/SsnL/Wordless

Conflicts:
	.DS_Store
.gitignore
remove .DS_Store
Merge branch 'master' of https://github.com/SsnL/Wordless

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/SsnL/Wordless