[flatmates]
[*] Player animation
Merge branch 'master' of https://github.com/andreiagaita/PersonalSpaceInvader

Conflicts:
	flatmates/Assets/Scenes/apartment3.unity
	flatmates/Assets/Scenes/apartment3.unity.meta