fixed post/get issue in index.html
Merge branch 'master' of github.com:christophernies/watersafe
merged conflict
Merge branch 'master' of github.com:christophernies/watersafe