wzzz brrrr
Merge f_in

Conflicts:
	newEmptyPHP99.php
Merge master into f_in

Conflicts:
	newEmptyPHP99.php
Merge pull request #12 from Bonfire-Modules/f_in

wzzz brrrr