Actually fixed logo
Fixed conflicts
Merge pull request #4 from NathanDeMaria/LogoFix

Actually fixed logo