merged require.js module
update readme
merged conflicts