Merge pull request #22 from notshi/notshi-master

resolved conflict
Merge pull request #21 from notshi/master

Changed colour of footer links and content.
Fixed links