Settings changes
Merge branch 'master' of https://github.com/Madroon/Project_Vulture

Conflicts:
	Project Vulture/Tornado 135/ProjectVulture_Inputs.m
	Project Vulture/Tornado 135/ProjectVulture_Main.m