fixed git error
Fixed some errors in level2
Merge branch 'master' of https://github.com/nguyenshane/Power-Pong

Conflicts:
	Assets/Level1.unity
	Assets/lEVEL2.unity
Changes to powerup objects
Fixing Issues
Problems
Update Menu for Options

Option is currently not working yet, just displaying
Merge remote-tracking branch 'origin/master' into Functional

Conflicts:
	Assets/Custom Assets/Scripts/PowerUp.cs
	Assets/lEVEL2.unity