Remove cuss words
Change add_effect to inherit from the fighter class
Merge remote-tracking branch 'origin/master'

Conflicts:
	firstrl.py