attempt at ajax
ajax merge
merge ajax
Merge pull request #18 from dustin520/master

attempt at ajax