Merge branch 'master' of github.com:CodePilotCo/CMS
Merge branch 'master' of github.com:CodePilotCo/CMS
Added a settings page (though it basically has no settings)
Merge branch 'master' of github.com:CodePilotCo/CMS
Merge pull request #67 from glenwayguy/master

Added a (basically blank) settings page, added the link to the navbar.