bug fixes and code formatting
adding in a bunch of memes
Merge pull request #28 from cgcardona/master

Bring the memes!