A2 code.
Merge branch 'master' of https://github.com/hamo26/417AppEngine
A2 commit.