merge
Character Select now features character portraits, added portraits
Merge branch 'master' of https://github.com/stu-millner/Game-Dev-4358

Conflicts:
	MonsterMarbles/Assets/New Terrain.asset
Merge branch 'master' of https://github.com/stu-millner/Game-Dev-4358
Added detection for clicks for wolfgang
Merge remote-tracking branch 'origin/TylerTest'

Conflicts:
	MonsterMarbles/Assets/Scripts/LaunchController.cs
Added file "AddZugiePower" Which is used to connect the power scripts to the Zugie prefabs.
Added the zugie power for Hotstreak.

FILES ADDED:
- HotStreakPower.cs

FILES CHANGED:
- AddZugiePower.cs
Minor tweaks I made before the duel.
Merge branch 'master' of https://github.com/stu-millner/Game-Dev-4358 into TylerTest
Fixed 4th turn bug, implemented point keeping, tried to hook in power scripts.

-Fixed the weird thing happening after the 3rd ball finished its turn.
-Started to hook up Stu's scripts but didn't get them working properly yet so they are disabled.
-Reworked the OutOfBoundsHandler so that it fired events which are now handled by the RingerController to keep score.

Todo: need to implement the playerCollected method of RingerController, details for what it should do in the comments.