added links to side menu
Prevent merge conflicts

Merge branch 'master' into side_menu
Merge pull request #70 from cdcueva/side_menu

Side menu