Day10

Pundit was really screwing with me, and then I hella messed up my history with git... I think. Kangie tried to help me out but it was a huge mess. lol

I think I have it more or less fixed now, but I'm a little afraid to merge with master because it seems this branch is both 6 ahead AND 6 behind master? Will merging it fix the mistakes in master?