Ajax now working
Merge branch 'master' of github.com:danemco/CS4990