Who snuck that in?
Merge branch 'revence27-master'
FUI
Merge branch 'master' of https://github.com/watshisface/iminsi-gihumbi

Conflicts:
	frontend/html/ccmdash.html
	frontend/html/ccmdash_table.html
	frontend/html/reddash_table.html
	iminsigihumbi.py
fix merge
Hist
CURRENT SITUATION
Merge branch 'master' of https://github.com/pivotaccess2007/iminsi-gihumbi

Conflicts:
	frontend/html/ancdash.html
	frontend/html/basicdisplay.html
	frontend/html/ccmdash_table.html
	frontend/html/newborn_table.html
	frontend/html/reddash_table.html
ui stuff

ui stuff