% to pixels
Merge branch 'master' of https://github.com/tnkhan/STEMCube

Conflicts:
	WebContent/index.html
	WebContent/style.css