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

Conflicts:
	RSTFriendViewController.swift