Homepage css fixed, master.css background added
fixed conflicts between school pages

Merge branch 'homepage-css'

Conflicts:
	views/school_page.erb