new navbar
Merge branch 'gh-pages' of https://github.com/eswstanford/redstudio into gh-pages

Conflicts:
	css/bootstrap.css