todo
auto
Merge branch 'master' of https://github.com/pachiara/alice

Conflicts:
	Gemfile