With info.
Merge branch 'master' of https://github.com/revence27/iminsi-gihumbi

Conflicts:
	frontend/html/index.html