Updating home page content, working on style

Don't remember making any changes in the config file -- so that makes me
nervous.
Merge branch 'master' of https://github.com/TSA-HCI573/PetProject

Conflicts:
	includes/styles/styles.css