javascript file modified to MVC
Merge pull request #23 from red-admirals-2014/mvc-js

javascript file modified to MVC
pre-merge working with conflict resolution things buzzwords