test
Merge branch 'master' of https://github.com/taimiso0319/WebDB

This reverts commit 78a893fbe3bffaec59158d56a5787546a358e0a7.

Conflicts:
	index.html