More changes Makefile in docs.
Yet more changes to the Makefile
Added optionals to Makefile
Merge branch 'master' of https://github.com/GlobalAppInitiative/Education-Resources