Pulled from Origin
Test file
Took out binding pry
Deleted extra code from _nav.html.erb
Working on footer
Fixed merge conflict