Changed code to version 2.

Deployed to GAE. With this version, need to add templates and move html
out of main.