Fixed commit merge conflict.
Merge pull request #31 from toonketels/footer

Fixed commit merge conflict.