Updated seed file
Merge branch 'master' into TheOneAjax
Ajax call working
fixed merge conflict in js
Merge pull request #61 from rongierlach/TheOneAjax

The one ajax