Fixes #31

choceFunct is now choiceFunction
Merge remote-tracking branch 'upstream/master'

Conflicts:
	shape.lua
Git is so frustrating some times.....
Found a bug (squashed)

just forgot the second = is all :P
Merge pull request #34 from Happydude11209/master

Found a bug (minor update)