added navbar, cohesive layout
resolved merge conflicts (hopefully)
Merge pull request #10 from ntlam/master

HALLELUUUUJAHHHh