final background image
merged application css with Sarah's changes
fixing merge conflict