resolved merge conflict, added navigation and styling
Merge pull request #9 from michaelohm/navigation

resolved merge conflict, added navigation and styling