WIP on building require.js
Solved merge conflict4