Add faraday
Merge branch 'master' of https://github.com/y-uuki/anxious

Conflicts:
	.gitmodules