merge
merge
merge
merge
merge
Added background to layout.rb, navigation bar, and form validation