handles base cases
Merge branch 'master' of https://github.com/mawilkin/370p2