Merge pull request #48 from eshem/master

bing
Merge pull request #49 from eshem/master

removed merge conflict heads
fixed footer