Added power ups
Added powerups
Merge branch 'master' of https://github.com/Trayus/cpgd_diskwars

Conflicts:
	DiskWars/DiskWars/DiskWars/Constants.cs
	DiskWars/DiskWars/DiskWarsContent/DiskWarsContent.contentproj
Fixed merge