ohhhboy

Conflicts:
	WingmanUnleashed/Assets/Scripts/Collectable.cs

equipment
Merge remote-tracking branch 'origin/master'