Update from M.'s google drive
Merge branch 'master' of https://github.com/nguyenshane/Power-Pong

Conflicts:
	Assets/Custom Assets/BallG_Fire.prefab
	Assets/Custom Assets/BallO_Fire.prefab
	Assets/Custom Assets/Scripts/Ball.cs
	Assets/Custom Assets/Scripts/PowerUp.cs
	Assets/Level1.unity
	Assets/lEVEL2.unity
Syncing
Revert "Merge branch 'master' of https://github.com/nguyenshane/Power-Pong"

This reverts commit c64846d38d7828efaf4f962da5fe87549ff1cda5, reversing
changes made to cf4ec70c2b96d34c24afd43a00849148c109dac5.
Revert 14eb4dc..0e9c2f3

This rolls back to commit 14eb4dc90df48ee22c6ab7c40fdc57888ef89c29.
Merge branch 'master' of https://github.com/nguyenshane/Power-Pong
Sync
Merge branch 'master' of https://github.com/nguyenshane/Power-Pong

Conflicts:
	Assets/Custom Assets/BallG_Fire.prefab
	Assets/Custom Assets/BallO_Fire.prefab
	Assets/Custom Assets/Scripts/Ball.cs
	Assets/Custom Assets/Scripts/PowerUp.cs
	Assets/Level1.unity
	Assets/lEVEL2.unity
Trying to overwrite the master branch..