Frontend files
Merge pull request #1 from eforbes/master

Minor changes
Merge pull request #1 from GoogleJump/master

Merging new frontend