Fix conflict in menu.erb
Update background image for #hours

We used the same image cause I forgot to commit my changes last
night…ha!
Merge branch 'dev' of github.com:zpfled/guevaras into dev

Conflicts:
	views/menu.erb