Asking for more time on decorator discussion - want to do more than I originally intended.
Merge branch 'master' of https://github.com/NelisW/planning into NelisW-master

Conflicts:
	17_May_2014.md
Merge branch 'NelisW-master'