Fixed multiple fainting calls
Merging previous commits
Merge branch 'master' of https://github.com/juliaducey/Heat-Wave

# By rwedge
# Via rwedge
* 'master' of https://github.com/juliaducey/Heat-Wave:
  scripts for umbrella

Conflicts:
	Assets/Scripts/Person.cs