updating
Merge branch 'master' of github.com:marcb70/ideasofmarch into colwick4
Added name chooser.
Merge branch 'colwick4'