Conflict solution
Merge pull request #7 from Gorgonello/aside-navigation

Conflict solution