Bootstrap, and nav changes
Merge pull request #4 from pmcote/template

Bootstrap, and nav changes