Merge branch 'master' of https://github.com/chronister/wardenclyffe
Updated index.js to use new index page
Merge branch 'master' of https://github.com/chronister/wardenclyffe
Merge branch 'master' of https://github.com/chronister/wardenclyffe
Updated index.js to use new index page
Merge branch 'master' of https://github.com/chronister/wardenclyffe
Updated template to actually use nav bar
Updated template to actually use nav bar
Filled in branding info
Filled in branding info
Added about page
Added about page
Added about page to index.js
Added about page to index.js
Integrated about page into style, readded nav to bootstrap
Integrated about page into style, readded nav to bootstrap
Made overview page more friendly looking
Made overview page more friendly looking
Fix after merge confusion
Merge branch 'about-page' of https://github.com/chronister/wardenclyffe into about-page