Minor changes in globals module exercise description
Merged second round branch
Merged everything into master