NPC moved

Moved NPC to Restaurant. Need to fix movement, collision, and player
colour bug.
Merge branch 'npc' of https://github.com/RishiRamraj/pong into npc

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