Change to jquyery latest
Merge branch 'master' of github.com:zdwolfe/ducking-dubstep
Merging routes and controllers, working on getting app.js
merge