Hi Fred,
These are the steps you ought to be able to go through:
1. on the development machine (not the server), pull in with Git the latest changes from the core site and merge these into your current code (which has all the essay questions updates etc). You should be able to use "git fetch upstream" (
https://help.github.com/articles/syncing-a-fork/), then merge the changes into your code base
2. There may be conflicts which will need to be resolved before you can commit the changes
3. Once all working correctly on your dev machine, commit back up to your Oppia GitHub repository
4. On the server side, you'll need to be linking the code here to your version of the OppiaMobile server - rather than the core code
5. Whether and how much of the set up on the amazon server you need to remove will depend on what (if any conflicts there were)
Cheers,
Alex