startup

Nothing developed yet.
Merge branch 'master' of https://github.com/karavias/computergames

Conflicts:
	Assets/Scenes/scene1.unity
	Assets/Scripts.meta