Merge pull request #64 from rongierlach/TheOneAjax

The one ajax
Removed alerts from js
Merge branch 'master' into TheOneAjax