Merge branch 'master' into kpam-iter4
templating index.html
search, index template, styling, login story
Merge branch 'kpam-iter4'