Devise
Merge branch 'master' of ssh://github.com/zenkovnick/aconverter

Conflicts:
	.gitignore