Ajax in process
Fixed conflicts
working ajax
Merge pull request #12 from JustSilverman/ajax

working ajax