adding all of the files for the ajaxifying assignment
 Fixed carrierwafe and minimagick
Merge branch 'ajax'
 resolve merge conflict