stable version
Merge branch 'master' of https://github.com/billy5521/Quanta-Labs-Website

This reverts commit 97fba5122be76b0ce2e67eb4dade7ef4dc92395f.

Conflicts:
	css/style.css
	img/Dr Liu Hi Res.jpg
	index.html
	js/animation.js
	js/cbpAnimatedHeader.js
	testService.html