Just merged master, re-editing list of webs; database
Modified images; these look more like lightning
Changed "users" to "tests" in the bar chart
Added an faq and other minor changes here and there.
Edit to the faq, and their style
Merge branch 'develop' of https://github.com/Xuefeng-Zhu/cSpeed

Conflicts:
	app/js/controllers.js
Update introduction.html
Minor UI tweaks in various places
Merge branch 'master' of https://github.com/Xuefeng-Zhu/cSpeed
fix error
Merge branch 'master' of https://github.com/Xuefeng-Zhu/SpeedTest into develop

Conflicts:
	app/js/app.js