Revert "test"

This reverts commit 8aee9c2f4e87529af7892c5bf8ef9bd64a2815d1.
Merge remote-tracking branch 'origin/master'

Conflicts:
	basic.html
test

Conflicts:
	basic.html
Merge branch 'master' of https://github.com/alexwawo/ubm_webpro