(*knocks on wood*) Finished tweaking JS
Merge pull request #15 from riknos314/master

(*knocks on wood*) Finished tweaking JS