little fixes post merge
doc ready
Merge branch 'master' of github.com:birge/codingdojo
fixed little merge things