Bomb Digity
Merge remote-tracking branch 'origin/master' into super_cool_changes

Conflicts:
	hello.py
Merge pull request #2 from excaliburHisSheath/super_cool_changes

Bomb Digity