outch
outch
Merge branch 'master' of https://github.com/mrstocks/secret-ninja

Conflicts:
	helpers/helper.php
Here goes nothing