commit of ajax branch
merging files
sorted out duplication errors and a bit of formatting