Merge pull request #31 from stuycs-softdev/judy

Update templates
Update index.html, layout.html