commit before latest pull
Merge branch 'master' of https://github.com/mklemme/freepee
Message
Merge branch 'master' of https://github.com/mklemme/freepee

message
amends to index page
merge conflicts resolved, adding changes to index page again
Merge pull request #38 from codemeup/master

Editing the index page with the gif and address option.