typing stuff is a bit more solid
Merge branch 'master' of github.com:geosanders/Calcu

Conflicts:
	calcu.css