Добавлен гем slim
Merge branch 'master' into feature-user-authentication

Conflicts:
	Gemfile