added some stuff
Merge branch 'master' into TheOneAjax
Merge pull request #62 from rongierlach/TheOneAjax

The one ajax