update
Merge branch 'master' of https://github.com/mamaragun/testpj

Conflicts:
	index.php
Merge branch 'master' of https://github.com/mamaragun/testpj

Conflicts:
	config.php
	index.php