removed some stuff
wtf
Merge branch 'master' of https://github.com/laflechejonathan/grinch.ly
unclearx