Bugs fixing again
Fixing conflicts
Editing landing page
Fixing link style on footer
Merge pull request #8 from alcatrazia/master

Fixing bugs