Try #2
Merge branch 'master' of https://github.com/Insality/cattus

Conflicts:
	Cattus/Assets/Scenes/Test.unity
Merge branch 'master' of https://github.com/Insality/cattus

Conflicts:
	Cattus/Assets/Scenes/Test.unity