Merge pull request #1 from DennyWest/wk04homework

added habitat stuff
updated files
no actual conflict?
added files wk 05
added dots to so. cal.
new title of page
Merge pull request #2 from DennyWest/wk05turnin

Wk05turnin
resolved merge conflicts