I want to merge my master with your ron_working

It is still having an issue I have no clue about, so production doesn't work with the navbar. However, using rails s makes it work.