Merge branch 'develop'

Conflicts:
	chicken.py
change default info
add listing