Error Fix
Merge branch 'Jon's-Branch' of https://github.com/WeaveJon/MobileGame into Jon's-Branch

Conflicts:
	Unity Project/Library/expandedItems