add gem for testing
merge conflicts
fix footer
Merge pull request #62 from fedetaglia/master

fix footer and some test