Edit templates with css
Edit templates
Edit templates, fix merge error
Merge pull request #22 from stuycs-softdev/judy

Edit templates with css, fix merge error
Revert back to previous
Merge pull request #23 from stuycs-softdev/judy

Revert back to previous layout.html
Localize resources
Clean up functions and template links
Resolve merge conflicts