Bulk of Edits
Merge branch 'master' of https://github.com/james7132/Hysteria

Conflicts:
	Assets/Editor/AttackPatternEditor.cs
	Assets/Main.unity
	Assets/Prefabs/Player.prefab
	Assets/Scripts/Pooled Objects/AttackPattern.cs
	Assets/Scripts/Pooled Objects/Pickup.cs
	Hysteria.userprefs