added images, playing with layout to get the default for each page set
fixed paths for background images
fixed merge conflicts
Merge branch 'master' of https://github.com/nojoek/lets530 into bondy

Conflicts:
	app/views/layouts/application.html.erb

fixed merge conflicts
Merge pull request #1 from nojoek/bondy

Bondy