added requirejs
merging