NPC Collision

omg it works
NPC Collision

Fixed player bullying
Cleaned up NPC code

Just as the title says
NPC fail

lol
Revert "Cleaned up NPC code"

This reverts commit b4b5516b7fd2a828a0dbfb47a09a276512f573a7.
Revert 88795a9..a55d23c

This rolls back to commit 88795a9ce046f81554752ab23cf0857730fb7ca9.
Revert "Revert 88795a9..a55d23c"

This reverts commit a786fa300ae65b173cff90f334116a29c3608fc7.
Revert "Revert "Cleaned up NPC code""

This reverts commit a55d23cdd3db61fd6ad67d8ea2327c4d363818c1.
Revert "NPC fail"

This reverts commit 88795a9ce046f81554752ab23cf0857730fb7ca9.
NPC moved

Moved NPC to Restaurant. Need to fix movement, collision, and player
colour bug.
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
Fixed the recent merge.
Object function

Passing the player through the object function
Added sprites.
Object update

Added object draw function
Graphics

Added player sprite. Still need NPC sprite and animations
NPC Sprites

Added sprites for NPCs. Still need animations.
Animation fail

Didn't work. :(
Revert "Animation fail"

This reverts commit adcc7de2bd833bbe3aa909045ae8717fbf29fb5a.