Merge branch 'daniel'

Conflicts:
	Assets/CtrlScript.cs
Merge branch 'master' of https://github.com/Omnes/Bananas
removed duplicates