updating
Merge branch 'master' of https://github.com/zkirkland/RedBull

Conflicts:
	redbull.py
git fix?