wtf
Merge branch 'master' of https://github.com/syltman/parrotGame

Conflicts:
	src/class/Traps.lua
	src/specs.lua