small changes to js and controller
Merge pull request #34 from nemrow/javascript_ninja_time

small changes to js and controller