basic content levels and responsive nav bar
log
Merge branch 'master' into gh-pages

Conflicts:
	fire_app_log.txt
log