Merge branch 'master' of https://github.com/cmhedrick/tutor_hub