resized player sprites in 3 views, 2+ views for npc, 2+ views for dresser, 1+view for bed wall and carpet tile, long lamp
Merge branch 'master' of https://github.com/davism4/fearmonger

Conflicts:
Assets/Art/Player/tentacle01-01.png
Assets/Art/Player/tentacle01.png
Assets/Art/Sprites/door-01.png
Assets/Art/Things/door.png
Assets/Resources/Sprites/Player/player-00-down.png
Assets/Resources/Sprites/Player/player-01-up.png
Assets/Resources/Sprites/Player/player-02-right.png
Assets/Resources/Sprites/Player/player-04-downinv.png
Assets/Resources/Sprites/Projectiles/tentacle01-01.png
Assets/Resources/Sprites/Rooms/door-01.png
Assets/Resources/Sprites/Victims/PersonNormal.png
Assets/Resources/Sprites/spritesheet01backing.jpg
Merge branch 'master' of https://github.com/davism4/fearmonger

Conflicts:
	Assets/Art/Player/tentacle01-01.png
	Assets/Art/Player/tentacle01.png
	Assets/Art/Sprites/door-01.png
	Assets/Art/Things/door.png
	Assets/Resources/Sprites/Player/player-00-down.png
	Assets/Resources/Sprites/Player/player-01-up.png
	Assets/Resources/Sprites/Player/player-02-right.png
	Assets/Resources/Sprites/Player/player-04-downinv.png
	Assets/Resources/Sprites/Projectiles/tentacle01-01.png
	Assets/Resources/Sprites/Rooms/door-01.png
	Assets/Resources/Sprites/Victims/PersonNormal.png
	Assets/Resources/Sprites/spritesheet01backing.jpg
Fixing filenames