Added proto area 2
Merge branch 'HEAD' of https://github.com/kyledobitz/echoes

Conflicts:
	Echoes/Assets/Area1Scene.unity
	Echoes/Echoes-csharp.sln
	Echoes/Echoes.sln
	Echoes/Echoes.userprefs
	Echoes/Library/CurrentLayout.dwlt
	Echoes/Library/InspectorExpandedItems.asset
	Echoes/Library/assetDatabase3
	Echoes/Library/expandedItems
	Echoes/Library/guidmapper