Merge pull request #145 from BuracayBeach/Team_5_Version_2.0

Updated js's