still working on jquery
Merge branch 'refactoring_ajax' into development
"building out jquery"