fixed merging conflicts
started working on ajax
Merge pull request #9 from laurenbenichou/master

Started working on ajax