Merge branch 'master' of https://github.com/Kalseng/Pokemon-Bullet-Hell

Conflicts:
	PokeShmup Final Build/Assets/Scenes/Level 1.unity
	PokeShmup Final Build/Library/CurrentLayout.dwlt
	PokeShmup Final Build/Library/ScriptAssemblies/Assembly-CSharp.dll
	PokeShmup Final Build/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	PokeShmup Final Build/Library/assetDatabase3
	PokeShmup Final Build/Library/expandedItems
	PokeShmup Final
Build/Library/metadata/8b/8b2004fb661524634861a4ec38957793
	PokeShmup Final
Build/Library/metadata/c4/c4f259736ed18c84aa33ad2bd4a84a77
	PokeShmup Final Build/PokeShmup Final Build-csharp.sln
	PokeShmup Final Build/PokeShmup Final Build.sln
	PokeShmup Final Build/PokeShmup Final Build.userprefs