Localize resources
Merge pull request #22 from stuycs-softdev/judy

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

Revert back to previous layout.html
Clean up functions and template links
Localize resources
Clean up functions and template links
Resolve merge conflicts
Merge pull request #24 from stuycs-softdev/ben

Ben
Update with css
Update css, fix merge conflict