Fix error with nav bar
Merge branch 'day1end' into day4start

* day1end:
  Fix error with nav bar

Conflicts:
	Gemfile.lock