Merge branch 'master' of https://github.com/sashjakk/ruby-ventt

Conflicts:
	.gitignore