Merge branch 'master' of https://github.com/thirdside/berlin-ai

Conflicts:
	lib/version.rb