made Touch Controller
Merge branch 'master' of https://github.com/brandann/BeachTD

Conflicts:
	BeachTD-Prototypes/Assembly-CSharp-vs.csproj
	BeachTD-Prototypes/Assembly-CSharp.csproj
	BeachTD-Prototypes/Assets/proto_tower.unity
	BeachTD-Prototypes/BeachTD-Prototypes-csharp.sln
	BeachTD-Prototypes/BeachTD-Prototypes.sln
	BeachTD-Prototypes/BeachTD-Prototypes.userprefs
	BeachTD-Prototypes/Library/AssetServerCacheV3
	BeachTD-Prototypes/Library/CurrentLayout.dwlt
	BeachTD-Prototypes/Library/ScriptMapper
	BeachTD-Prototypes/Library/assetDatabase3
	BeachTD-Prototypes/Library/guidmapper
	BeachTD-Prototypes/Library/metadata/fe/fe18982caae664989a118fb3b9de3a34