Adding conflict exercise and mods to functions and modules.
Mod to functions
Final exercise
Next added
Removed else from heading too.
Merge pull request #111 from karinlag/2013-05-krakow

2013 05 krakow