Added content and navigation links
Brought nav back to left
Started work on nav bar
Merge remote-tracking branch 'ivan/master'