merge

	modified:   projects/utahavalanches/homepage.html
Merge branch 'master' of git://github.com/pTricKg/web_dev