fett super
ssj commit
Merge branch 'master' of github.com:f3lixz/the-next-big-thing into f3lixz-master

Conflicts:
	bullet.rb