final update

Final version.
Two .js files included because a few changes were made after the project
was handed in.