Minor code changes

Updated some of the Character class
Merge branch 'master' of https://github.com/Identify-Crisis/Air

Conflicts:
	Air/Character.cs

git commit