changes
Merge branch 'master' of https://github.com/mlripp2/White-Nose-Syndrome

Conflicts:
	css/style.css