gemfile
Merge branch 'master' of https://github.com/Losangelo/graficapiaui
Merge branch 'master' of https://github.com/Losangelo/graficapiaui

Conflicts:
	Gemfile