Testing again
w/e
finished section 1
Fixing Juan's Fuck Up
Merge branch 'Juan', remote-tracking branch 'origin' into Kory
Merge branch 'Kory', remote-tracking branch 'origin' into Juan
Still working...
Merge branch 'Kory', remote-tracking branch 'origin' into Juan