removed useless code
Merge pull request #11 from Bonfire-Modules/flying_to_mars

removed useless code
fixing conflicts
Merge master into f_in

Conflicts:
	newEmptyPHP99.php