Multiple NPCs

Made a second NPC and made collision detection.
Merge branch 'npc' of https://github.com/RishiRamraj/pong into npc

Conflicts:
	main.lua
	map.lua
	maps/lab.lua
	maps/restaurant.lua