a little slip up
Merge branch 'master' of https://github.com/ndomar/megasoft-13 into c4s11_register_by_email
ad