Merge branch 'master' of https://github.com/cabandamar/waif

Conflicts:
	waif.md
Merge branch 'master' of https://github.com/cabandamar/waif