Display size

Display size 800x600
Add Stick

Add Stick as Entity
Add demo -- show sticks
Remove demo -- show Entities (stones)
Merge pull request #2 from raincole/davy_working

Add Stick
Player moving
Merge branch 'master' into raincole_working
Merge pull request #3 from raincole/raincole_working

Raincole working
Pick & Drop
Merge branch 'master' into raincole_working
Improve dropping
Merge branch 'fntsrlike' of github.com:raincole/isr

Conflicts:
	classes.lua
Merge branch 'raincole_working'

Conflicts:
	main.lua
Use Fisher's stable sorting algorithm
Cache current target item
Remove redundant prints
Merge pull request #6 from raincole/raincole_working

Raincole working
Add StickManager

Add StickManager extends Entity
Add demo -- StickManager
random light stick

as title
Merge branch 'davy_working'

Conflicts:
	game/stick.lua
	main.lua
don't play animation while player stands still
Add Animator