Merge commit 'ea5b03a1af6515f54c3d45368dcd96ebb2610325' into HEAD
Yay backtracking

This doesn't contain the Update Menu for Options changes
Merge remote-tracking branch 'origin/master' into Functional

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