javascript1 finishes
Merge branch 'master' of https://github.com/pondit/FTFL01-ITS-ASPNET.git