Power Effects
Merge branch 'master' of https://github.com/smyrick/eecs499-sidework

Conflicts:
	Unity/PowerEffects/PowerEffects.userprefs