removd prev home
Merge remote-tracking branch 'origin/master'

Conflicts:
	final_scrapbook_website/finalHome.html