first time on DoctorTemplate
Merge branch 'master' of https://github.com/jnorthr/DoctorTemplate