combined javascript files
Merge pull request #4 from sgnl/master

combined javascript files