Some command_me fixes w.r.t. colors
Merge branch 'master' of github.com:ewust/xmaspi
Merge branch 'master' of github.com:ewust/xmaspi
Hi

Merge branch 'master' of github.com:ewust/xmaspi
Merge branch 'master' of github.com:ewust/xmaspi

Conflicts:
	command_me.py
Merge branch 'master' of github.com:ewust/xmaspi

foo merge
Merge branch 'master' of github.com:ewust/xmaspi

more merge nonsense
Merge branch 'master' of github.com:ewust/xmaspi

we gotta fix this shit
Merge branch 'master' of github.com:ewust/xmaspi
Merge branch 'master' of github.com:ewust/xmaspi
Merge branch 'master' of github.com:ewust/xmaspi
Merge branch 'master' of github.com:ewust/xmaspi
Merge branch 'master' of github.com:ewust/xmaspi
Merge branch 'master' of github.com:ewust/xmaspi
Merge branch 'master' of github.com:ewust/xmaspi
Merge branch 'master' of github.com:ewust/xmaspi
Merge branch 'master' of github.com:ewust/xmaspi
Merge branch 'master' of github.com:ewust/xmaspi
Merge branch 'master' of github.com:ewust/xmaspi
Merge branch 'master' of github.com:ewust/xmaspi