Merge pull request #2 from alcatrazia/master

New homepage and navigation
Adding description to the homepage
Fixing conflicts