secret
Merge branch 'master' of https://github.com/mousems/ntust-bomb

Conflicts:
	function.php
debug pull