Updated build settings.
Merge branch 'master' of https://github.com/phoenixperry/NYHS_1

Conflicts:
	ProjectSettings/ProjectSettings.asset