Player Controller
Merge branch 'master' of https://github.com/Mattivc/ggj14 into Martin

Conflicts:
	Assets/ISFramework.meta
	Assets/Materials.meta
	Assets/Scenes/scene1.unity
	Assets/Scripts.meta
	Assets/Scripts/EtherObject.cs
	Assets/Scripts/EtherObject.cs.meta
New scene
no message
Merge branch 'Martin'