Merge branch 'master' of https://github.com/jmmastey/level_up_exercises into dinodex
pulling upstream
keeping changes to triangle
merged triangle
Merge branch 'dinodex'