Merge pull request #2 from Databates/Dan

pushing up some routes and some jquery magic
updates