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

Conflicts:
	.DS_Store
	Wordless/RSTMessage.swift