Changed github link to point to real repository
Adding comments for all javascript files
Updated conflict in text from local repository