finished with my heuristics (1-4)
Merge branch 'master' of https://github.com/alr018/critique

Conflicts:
	usercontrol.html