styling of the page
fixed merge conflicts
Merge pull request #3 from rock-doves-2014/daniel_luke

changes on css