c
Merge branch 'master' of https://github.com/EloiZ/Defi

Conflicts:
	Gemfile