fixed bugs
final materials pushed
:wMerge branch 'master' of https://github.com/NCEAS/training