changes to footer and icons on header
stupid conflicts
another stupid commit problem
Merge pull request #12 from nnagewad/master

changes to footer and icons on header