ray1007/NMFinal — pull request #1 by PatrickChen83 (2014-12-30 12:35:39+00:00)
Title: Update main.js

merge