metode
Merge branch 'master' of https://github.com/tkesgar/ngidesehat

Conflicts:
	info.html
	js/info.js