blerp
Merge branch 'master' of https://github.com/Bodylord/Shmup-Game

Conflicts:
	Shmup_Clone/Library/CurrentLayout.dwlt
	Shmup_Clone/Library/expandedItems
	Shmup_Clone/Shmup_Clone-csharp.sln
	Shmup_Clone/Shmup_Clone.sln
	Shmup_Clone/Shmup_Clone.userprefs