testei
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	features/delete_member.feature
Merge branch 'master' of github.com:kantoliinary/kantoliina