jquery halfway done
Merge pull request #4 from mike6838/controller

jquery halfway done