[flatmates] Apartment2 updated
Merge branch 'master' of https://github.com/andreiagaita/PersonalSpaceInvader
[flatmates] Apartment2 updated
Merge branch 'master' of https://github.com/andreiagaita/PersonalSpaceInvader
[flatmates] Apartment2 updated
Merge branch 'master' of https://github.com/andreiagaita/PersonalSpaceInvader

Conflicts:
	flatmates/Assets/Sprites/Furniture/Bathroom.meta
	flatmates/Assets/Sprites/Furniture/Bathroom/clothes.png.meta
	flatmates/Assets/Sprites/Furniture/Bathroom/conditioners and bottles.png.meta
	flatmates/Assets/Sprites/Furniture/Bathroom/cupboard.png.meta
	flatmates/Assets/Sprites/Furniture/Bathroom/floor.png.meta
	flatmates/Assets/Sprites/Furniture/Bathroom/mirror.png.meta
	flatmates/Assets/Sprites/Furniture/Bathroom/shower.png.meta
	flatmates/Assets/Sprites/Furniture/Bathroom/sink.png.meta
	flatmates/Assets/Sprites/Furniture/Bathroom/wallpaper.png.meta
	flatmates/Assets/Sprites/Furniture/Bathroom/washingMachine.png.meta
	flatmates/Assets/Sprites/Furniture/Living Room/coffeeTable.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/bed2.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/dumbbell.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/multipurposeBox.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/shirt.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/sock.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/unityPoster.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/wallpaper2.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/wallpaper3.png.meta
	flatmates/Assets/Sprites/Furniture/sideDoor.png.meta
	flatmates/Assets/Title Screen.meta
	flatmates/Assets/Title Screen/title_bg.png.meta
	flatmates/Assets/Title Screen/title_example.png.meta
	flatmates/Assets/Title Screen/title_text.png.meta