add busstop
Merge branch 'master' of github.com:linuxbbq/xcolors

Conflicts:
	fb_colors/busstop