BxI y BeM version 1.0
Version Final 1.1
ToolTip
Merge branch 'master' of https://github.com/adsgm/demos

Conflicts:
	BeM/assets/css/main.css
	BeM/assets/img/btns/btn-questions2.png
	BeM/assets/js/engine.js
	BeM/paga.html
	BeM/preferencias.html
	index.html
	preferencias.html