Pulling
Fixed conflicts
Fixed conflicts
Sidenav links and replaced icons
Merge pull request #87 from JoshFB/icons

Icons