test 6
Merge branch 'master' of https://github.com/lekkapu/Tokenpay

Conflicts:
	how_it_works.php