More merging! Paddles and launching balls.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unity/Assets/Scenes/TestScene1.unity
	Unity/Assets/Scripts/Ball.cs
	Unity/Library/CurrentLayout.dwlt
	Unity/Library/InspectorExpandedItems.asset
	Unity/Library/ScriptAssemblies/Assembly-CSharp.dll
	Unity/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Unity/Library/assetDatabase3
	Unity/Library/metadata/05/05cf289aa996d4543ab6fb7e56e64def
	Unity/ProjectSettings/TagManager.asset
	Unity/Unity.userprefs